[oe] [meta-oe][PATCH] usleep: fix compile errors
From: Kai Kang Update usleep.c to fix following compile error: | usleep.c: In function 'main': | usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types] |47 | optCon = poptGetContext("usleep", argc, argv, options,0); | | ^~~~ | | | | | char ** | In file included from usleep.c:29: | /path_to/tmp-glibc/work/core2-64-wrs-linux/usleep/1.2/recipe-sysroot/usr/include/popt.h:217:41: note: expected 'const char **' but argument is of type 'char **' | 217 | int argc, const char ** argv, | | ~~^~~~ | usleep.c:68:12: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] |68 | countStr = poptGetArg(optCon); | |^ Signed-off-by: Kai Kang --- meta-oe/recipes-core/usleep/files/usleep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/usleep/files/usleep.c b/meta-oe/recipes-core/usleep/files/usleep.c index a5e7d9d715..dfa52ec19a 100644 --- a/meta-oe/recipes-core/usleep/files/usleep.c +++ b/meta-oe/recipes-core/usleep/files/usleep.c @@ -34,7 +34,7 @@ int main(int argc, char **argv) { int showVersion = 0; int showOot = 0; int rc; - char * countStr = NULL; + const char * countStr = NULL; struct poptOption options[] = { { "version", 'v', POPT_ARG_NONE, , 0, "Display the version of this program, and exit" }, @@ -44,7 +44,7 @@ int main(int argc, char **argv) { { 0, 0, 0, 0, 0 } }; - optCon = poptGetContext("usleep", argc, argv, options,0); + optCon = poptGetContext("usleep", argc, (const char **)argv, options,0); /*poptReadDefaultConfig(optCon, 1);*/ poptSetOtherOptionHelp(optCon, "[microseconds]"); -- 2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110707): https://lists.openembedded.org/g/openembedded-devel/message/110707 Mute This Topic: https://lists.openembedded.org/mt/106517953/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH] lvm2: rename to add version back
On 6/4/24 00:31, Khem Raj wrote: its now in lvm2.inc which is shared between libdevmapper.bb and lvm2.bb Thank you all. It triggers bbappend file can not find corresponding bb file. I'll figure it out. Regards, Kai On Mon, Jun 3, 2024 at 1:43 AM Kai Kang via lists.openembedded.org wrote: From: Kai Kang The version has been removed from recipe name by commit * cc4e9fbd82 lvm2: remove subitted patch it is not proper and rename to add the version back in recipe name. Signed-off-by: Kai Kang --- meta-oe/recipes-support/lvm2/{lvm2.bb => lvm2_2.03.22.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-oe/recipes-support/lvm2/{lvm2.bb => lvm2_2.03.22.bb} (100%) diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb similarity index 100% rename from meta-oe/recipes-support/lvm2/lvm2.bb rename to meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb -- 2.34.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110692): https://lists.openembedded.org/g/openembedded-devel/message/110692 Mute This Topic: https://lists.openembedded.org/mt/106458240/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] lvm2: rename to add version back
From: Kai Kang The version has been removed from recipe name by commit * cc4e9fbd82 lvm2: remove subitted patch it is not proper and rename to add the version back in recipe name. Signed-off-by: Kai Kang --- meta-oe/recipes-support/lvm2/{lvm2.bb => lvm2_2.03.22.bb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename meta-oe/recipes-support/lvm2/{lvm2.bb => lvm2_2.03.22.bb} (100%) diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb similarity index 100% rename from meta-oe/recipes-support/lvm2/lvm2.bb rename to meta-oe/recipes-support/lvm2/lvm2_2.03.22.bb -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110670): https://lists.openembedded.org/g/openembedded-devel/message/110670 Mute This Topic: https://lists.openembedded.org/mt/106458240/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-webserver][PATCH v4] apache2: fix multilib file conflicts
From: Kai Kang There are file conflicts of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Install the 'build' directory to ${libexecdir} by setting 'installbuilddir' to fix the conflicts. ${libexecdir} is not populated to sysroot by default, but command apxs requires these files, then add the dir to SYSROOT_DIRS to populate them. And inherit bbclasses multilib_script and multilib_header to fix follow-up conflicts: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Fix buildpaths warning as well: WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File /usr/share/apache2/build/config.nice in package lib32-apache2-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- v4: * revoke the modification for existing sed pattern in do_configure .../recipes-httpd/apache2/apache2_2.4.59.bb | 37 --- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..637add007 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' \ + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \ + ${S}/config.layout } do_install:append:class-target() { @@ -119,14 +121,15 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +146,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -152,20 +157,22 @@ do_install:append:class-native() { SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" +SYSROOT_DIRS += "${libexecdir}/${PN}/build" + apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} -sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - -sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAG
Re: [oe] [PATCH v3 1/1] apache2: fix multilib file conflicts
On 5/13/24 18:03, Peter Kjellerstedt wrote: -Original Message- From: Kai Sent: den 13 maj 2024 05:29 To: Peter Kjellerstedt Cc: openembedded-devel@lists.openembedded.org Subject: Re: [PATCH v3 1/1] apache2: fix multilib file conflicts On 5/12/24 21:59, Peter Kjellerstedt wrote: -Original Message- From: mailto:kai.k...@windriver.com mailto:kai.k...@windriver.com Sent: den 8 maj 2024 09:07 To: Peter Kjellerstedt mailto:peter.kjellerst...@axis.com Cc: mailto:openembedded-devel@lists.openembedded.org Subject: [PATCH v3 1/1] apache2: fix multilib file conflicts From: Kai Kang mailto:kai.k...@windriver.com There are file conflicts of apache2 when multilib enabled: [snip] @@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +sed -i -e 's#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#' \ I do not know if this was intentional or not, but the above changes the location of the CGI directory for all layouts, where it previously only changed the path used by the Debian layout. It is not a problem for us as we do not use it anyway (we actually remove it in our bbappend), but if it was intentional, it should be mentioned in the commit message, and if it was not intentional, then it should be reverted. It is indeed to change `the CGI directory` and it has been done a long time ago for all layouts. It may have been the intention, but until now, the path was only changed for layouts that use `${prefix}/usr/lib/cgi-bin` as cgidir, which only the Debian layout does. So it definitely needs to be documented as a change. Yes, you're right. I'll revert this modification. Regards, Kai It is just update the sed pattern to make it more clear this time. You also change `$''{libexecdir}/cgi-bin` to `${libexecdir}/cgi-bin`. This means that the modified file now contains the expanded value of ${libexecdir} rather than the unexpanded string as it did before. I do not think this is a problem per se, but you may as well continue to use $''{libexecdir} above and below to maintain the formatting of the file. + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \ This now works for us while using the RedHat layout. Thanks for your feedback. Regards, Kai //Peter -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110444): https://lists.openembedded.org/g/openembedded-devel/message/110444 Mute This Topic: https://lists.openembedded.org/mt/105976652/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH v3 1/1] apache2: fix multilib file conflicts
On 5/12/24 21:59, Peter Kjellerstedt wrote: -Original Message- From:kai.k...@windriver.com Sent: den 8 maj 2024 09:07 To: Peter Kjellerstedt Cc:openembedded-devel@lists.openembedded.org Subject: [PATCH v3 1/1] apache2: fix multilib file conflicts From: Kai Kang There are file conflicts of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Install the 'build' directory to ${libexecdir} by setting 'installbuilddir' to fix the conflicts. ${libexecdir} is not populated to sysroot by default, but command apxs requires these files, then add the dir to SYSROOT_DIRS to populate them. And inherit bbclasses multilib_script and multilib_header to fix follow up conflicts: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Fix buildpaths warning as well: WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File /usr/share/apache2/build/config.nice in package lib32-apache2-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- .../recipes-httpd/apache2/apache2_2.4.59.bb | 37 --- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..59db22310 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +sed -i -e 's#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#' \ I do not know if this was intentional or not, but the above changes the location of the CGI directory for all layouts, where it previously only changed the path used by the Debian layout. It is not a problem for us as we do not use it anyway (we actually remove it in our bbappend), but if it was intentional, it should be mentioned in the commit message, and if it was not intentional, then it should be reverted. It is indeed to change `the CGI directory` and it has been done a long time ago for all layouts. It is just update the sed pattern to make it more clear this time. + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \ This now works for us while using the RedHat layout. Thanks for your feedback. Regards, Kai + ${S}/config.layout } do_install:append:class-target() { @@ -119,14 +121,15 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +146,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:a
[oe] [PATCH v3 1/1] apache2: fix multilib file conflicts
From: Kai Kang There are file conflicts of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Install the 'build' directory to ${libexecdir} by setting 'installbuilddir' to fix the conflicts. ${libexecdir} is not populated to sysroot by default, but command apxs requires these files, then add the dir to SYSROOT_DIRS to populate them. And inherit bbclasses multilib_script and multilib_header to fix follow up conflicts: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Fix buildpaths warning as well: WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File /usr/share/apache2/build/config.nice in package lib32-apache2-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- .../recipes-httpd/apache2/apache2_2.4.59.bb | 37 --- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..59db22310 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,9 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +sed -i -e 's#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#' \ + -e 's#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#' \ + ${S}/config.layout } do_install:append:class-target() { @@ -119,14 +121,15 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +146,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -152,20 +157,22 @@ do_install:append:class-native() { SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" +SYSROOT_DIRS += "${libexecdir}/${PN}/build" + apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} -sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - -sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars
[oe] [PATCH v3 0/1] apache2: fix multilib file conflicts
From: Kai Kang v3: * substitute the install dir of `build` directory for all layout just as the same as the `cgidir` Hi Peter, Please have a try. If not work for you, please let me know. Regards, Kai Kai Kang (1): apache2: fix multilib file conflicts .../recipes-httpd/apache2/apache2_2.4.59.bb | 37 --- 1 file changed, 23 insertions(+), 14 deletions(-) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#110273): https://lists.openembedded.org/g/openembedded-devel/message/110273 Mute This Topic: https://lists.openembedded.org/mt/105976647/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [PATCH v2] apache2: fix multilib files confliction
On 4/29/24 05:32, Peter Kjellerstedt wrote: -Original Message- From: openembedded-devel@lists.openembedded.org On Behalf Of Kai Kang Sent: den 25 april 2024 05:07 To: openembedded-devel@lists.openembedded.org Subject: [oe] [PATCH v2] apache2: fix multilib files confliction From: Kai Kang There are files confliction of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Install the 'build' directory to ${libexecdir} to fix the confliction by setting 'installbuilddir'. ${libexecdir} is not populated to sysroot by default, but command apxs requires these files, then add the dir to SYSROOT_DIRS to populate them. And inherit bbclasses multilib_script and multilib_header to fix follow up conflictions: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Fix buildpaths warning as well: WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File /usr/share/apache2/build/config.nice in package lib32-apache2-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- v2: * still populate `.../build` directory after installed to ${libexecdir} * fix buildpaths warning .../recipes-httpd/apache2/apache2_2.4.59.bb | 38 --- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..5b170fac3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,10 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +# only modify layout Debian which is adopted +sed -i -e '/Layout Debian/,/\Layout/ s#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#g' \ +-e '/Layout Debian/,/\Layout/ s#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#g' \ +${S}/config.layout } do_install:append:class-target() { @@ -119,14 +122,15 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +147,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -152,20 +158,22 @@ do_install:append:class-native() { SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" +SYSROOT_DIRS += "${libexecdir}/${PN}/build" + apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindi
[oe] [PATCH v2] apache2: fix multilib files confliction
From: Kai Kang There are files confliction of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Install the 'build' directory to ${libexecdir} to fix the confliction by setting 'installbuilddir'. ${libexecdir} is not populated to sysroot by default, but command apxs requires these files, then add the dir to SYSROOT_DIRS to populate them. And inherit bbclasses multilib_script and multilib_header to fix follow up conflictions: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Fix buildpaths warning as well: WARNING: lib32-apache2-2.4.58-r0 do_package_qa: QA Issue: File /usr/share/apache2/build/config.nice in package lib32-apache2-dev contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- v2: * still populate `.../build` directory after installed to ${libexecdir} * fix buildpaths warning .../recipes-httpd/apache2/apache2_2.4.59.bb | 38 --- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..5b170fac3 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,10 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +# only modify layout Debian which is adopted +sed -i -e '/Layout Debian/,/\Layout/ s#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#g' \ +-e '/Layout Debian/,/\Layout/ s#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#g' \ +${S}/config.layout } do_install:append:class-target() { @@ -119,14 +122,15 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,${WORKDIR}/recipe-sysroot/,,g' \ + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +147,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -152,20 +158,22 @@ do_install:append:class-native() { SYSROOT_PREPROCESS_FUNCS:append:class-target = " apache_sysroot_preprocess" +SYSROOT_DIRS += "${libexecdir}/${PN}/build" + apache_sysroot_preprocess() { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} install -m 755 ${D}${bindir}/apxs ${SYSROOT_DESTDIR}${bindir_crossscripts} install -d ${SYSROOT_DESTDIR}${sbindir} install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} -sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs - -sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_C
Re: [oe] [meta-webserver][PATCH] apache2: fix multilib files confliction
On 4/22/24 23:36, Kai Kang wrote: From: Kai Kang There are files confliction of apache2 when multilib enabled: Please ignore it. v2 will be sent. Regards, Kai Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Set 'installbuilddir' to install dir 'build' to ${libexecdir} to fix the confliction. And inherit bbclasses multilib_script and multilib_header to fix follow up conflictions: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Signed-off-by: Kai Kang --- .../recipes-httpd/apache2/apache2_2.4.59.bb | 31 --- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..1827d652f 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,10 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +# only modify layout Debian which is adopted +sed -i -e '/Layout Debian/,/\Layout/ s#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#g' \ +-e '/Layout Debian/,/\Layout/ s#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#g' \ +${S}/config.layout } do_install:append:class-target() { @@ -119,14 +122,14 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +146,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -159,13 +164,13 @@ apache_sysroot_preprocess() { install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs -sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars
[oe] [meta-webserver][PATCH] apache2: fix multilib files confliction
From: Kai Kang There are files confliction of apache2 when multilib enabled: Error: Transaction test error: file /usr/share/apache2/build/config.nice conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/share/apache2/build/config_vars.mk conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Set 'installbuilddir' to install dir 'build' to ${libexecdir} to fix the confliction. And inherit bbclasses multilib_script and multilib_header to fix follow up conflictions: file /usr/bin/apxs conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp file /usr/include/apache2/ap_config_layout.h conflicts between attempted installs of apache2-dev-2.4.58-r0.cortexa57 and lib32-apache2-dev-2.4.58-r0.armv7vet2hf_vfp Since multilib_script inherits update-alternatives, remove it from inherit line for beautification. Signed-off-by: Kai Kang --- .../recipes-httpd/apache2/apache2_2.4.59.bb | 31 --- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb index b96e8b4e1..1827d652f 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb @@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e S = "${WORKDIR}/httpd-${PV}" -inherit autotools update-rc.d pkgconfig systemd update-alternatives +inherit autotools update-rc.d pkgconfig systemd multilib_script multilib_header DEPENDS = "openssl expat pcre apr apr-util apache2-native " @@ -80,7 +80,10 @@ EXTRA_OECONF:class-native = "\ " do_configure:prepend() { -sed -i -e 's:$''{prefix}/usr/lib/cgi-bin:$''{libexecdir}/cgi-bin:g' ${S}/config.layout +# only modify layout Debian which is adopted +sed -i -e '/Layout Debian/,/\Layout/ s#\(cgidir:\s*\).*#\1${libexecdir}/cgi-bin#g' \ +-e '/Layout Debian/,/\Layout/ s#\(installbuilddir:\s*\).*#\1${libexecdir}/${PN}/build#g' \ +${S}/config.layout } do_install:append:class-target() { @@ -119,14 +122,14 @@ do_install:append:class-target() { -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-ffile-prefix-map[^ ]*,,g' \ -e 's,${HOSTTOOLS_DIR}/,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${datadir}/apache2/build/config_vars.mk + -e 's,APU_CONFIG = .*,APU_CONFIG = ,g' ${D}${libexecdir}/${PN}/build/config_vars.mk sed -i -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ -e 's,${DEBUG_PREFIX_MAP},,g' \ -e 's,${RECIPE_SYSROOT},,g' \ -e 's,-fdebug-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g; s,-fmacro-prefix-map[^ ]*,,g' \ -e 's,APU_INCLUDEDIR = .*,APU_INCLUDEDIR = ,g' \ - -e 's,".*/configure","configure",g' ${D}${datadir}/apache2/build/config.nice + -e 's,".*/configure","configure",g' ${D}${libexecdir}/${PN}/build/config.nice if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d/ @@ -143,6 +146,8 @@ do_install:append:class-target() { rm -rf ${D}${localstatedir} ${D}${sbindir}/envvars* chown -R root:root ${D} + +oe_multilib_header apache2/ap_config_layout.h } do_install:append:class-native() { @@ -159,13 +164,13 @@ apache_sysroot_preprocess() { install -m 755 ${D}${sbindir}/apachectl ${SYSROOT_DESTDIR}${sbindir} sed -i 's!my $installbuilddir = .*!my $installbuilddir = "${STAGING_DIR_HOST}/${datadir}/${BPN}/build";!' ${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs -sed -i 's!^APR_CONFIG = .*!APR_CONFIG = ${STAGING_BINDIR_CROSS}/apr-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^APU_CONFIG = .*!APU_CONFIG = ${STAGING_BINDIR_CROSS}/apu-1-config!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^includedir = .*!includedir = ${STAGING_INCDIR}/apache2!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^CFLAGS = -I[^ ]*!CFLAGS = -I${STAGING_INCDIR}/openssl!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^EXTRA_LDFLAGS = .*!EXTRA_LDFLAGS = -L${STAGING_LIBDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!^EXTRA_INCLUDES = .*!EXTRA_INCLUDES = -I$(includedir) -I. -I${STAGING_INCDIR}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk -sed -i 's!--sysroot=[^ ]*!--sysroot=${STAGING_DIR_HOST}!' ${SYSROOT_DESTDIR}${datadir}/${BPN}/build/config_vars.mk +sed -i 's!^AP
[oe] [meta-oe][PATCH] thin-provisioning-tools: install binary to ${sbindir}
From: Kai Kang The binaries of thin-provisioning-tools 0.9.0 are installed to ${sbindir}. And it also set BINDIR in the Makefile in the git repo: BINDIR:=$(DESTDIR)$(PREFIX)/sbin Tweak to install binary to ${sbindir} and create link files there. Signed-off-by: Kai Kang --- .../thin-provisioning-tools_1.0.12.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb index 11b5866189..09b91f6b37 100644 --- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb +++ b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb @@ -20,6 +20,10 @@ require ${BPN}-crates.inc require ${BPN}-git-crates.inc do_install:append() { + install -d ${D}${sbindir} + mv ${D}${bindir}/pdata_tools ${D}${sbindir}/pdata_tools + rmdir --ignore-fail-on-non-empty ${D}${bindir} + for tool in cache_check \ cache_dump \ cache_metadata_size \ @@ -41,6 +45,6 @@ do_install:append() { era_dump \ era_invalidate \ era_restore; do -ln -sf pdata_tools ${D}${bindir}/$tool +ln -sf pdata_tools ${D}${sbindir}/$tool done } -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#109633): https://lists.openembedded.org/g/openembedded-devel/message/109633 Mute This Topic: https://lists.openembedded.org/mt/105170455/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] Packages depends on libadwaita should require distro feature opengl
From: Kai Kang libadwaita requires distro feature 'opengl', so packages depends on it either directly or indirectly should require distro feature 'opengl' too. Signed-off-by: Kai Kang --- .../network-manager-applet/network-manager-applet_1.36.0.bb| 1 + meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb| 2 +- meta-gnome/recipes-gnome/ghex/ghex_45.1.bb | 2 ++ meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb | 1 + .../gnome-online-accounts/gnome-online-accounts_3.48.0.bb | 1 + meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb | 1 + meta-gnome/recipes-gnome/rest/rest_0.9.1.bb| 3 ++- meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb| 1 + 8 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb index 5f1f05cb2c..10e514775a 100644 --- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb +++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.36.0.bb @@ -7,6 +7,7 @@ DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes ns inherit features_check gnomebase gsettings gtk-icon-cache gettext pkgconfig ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "opengl" SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" diff --git a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb index e9ee434add..9b1a02bb09 100644 --- a/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb +++ b/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.5.bb @@ -14,7 +14,7 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gtk-doc gobject-introspection pkgconfig features_check # for gnome-online-accounts -REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES = "x11 opengl" #SRC_URI += " file://0001-Update-rest-requirement-to-rest-1.0.patch" SRC_URI[archive.sha256sum] = "9cb381b3f78ba1136df97af3f06e3b11dcc2ab339ac08f74eda0f8057d6603e3" diff --git a/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb index 2b6adaf91c..5901e3c093 100644 --- a/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb +++ b/meta-gnome/recipes-gnome/ghex/ghex_45.1.bb @@ -17,4 +17,6 @@ inherit gnomebase gsettings gtk-icon-cache gnome-help gettext gobject-introspect SRC_URI[archive.sha256sum] = "fb2b0823cd16249edbeaee8302f9bd5005e0150368b35f1e47c26680cacac2fa" +REQUIRED_DISTRO_FEATURES = "opengl" + FILES:${PN} += "${libdir} ${datadir}/metainfo" diff --git a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb b/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb index 9669e337a8..d03b5fe04d 100644 --- a/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb +++ b/meta-gnome/recipes-gnome/gnome-console/gnome-console_45.0.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a" GTKIC_VERSION = "4" inherit gnomebase gsettings pkgconfig gtk-icon-cache +REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = " \ desktop-file-utils-native \ diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb index 47b234e235..5742e8e964 100644 --- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb +++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.48.0.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36" inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goabackend', 'opengl', '', d)}" DEPENDS = "gdk-pixbuf dbus glib-2.0" diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb index 15e3d889f5..a65fc61feb 100644 --- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb +++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb @@ -14,6 +14,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase pkgconfig gettext gtk-doc vala gobject-introspection manpages features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'goa', 'opengl', '', d)}" do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" diff
Re: [oe] [meta-python][PATCH 1/2] python3-pyudev: provide native
On 12/13/23 15:58, Yoann Congal wrote: Hi, Le 13/12/2023 à 08:07, Khem Raj a écrit : On Tue, 05 Dec 2023 22:50:31 +0800, kai.k...@windriver.com wrote: Add 'native' to BBCLASSEXTEND to provides python3-pyudev-native which is required by lvm2 when package config 'dbus' is enabled. Applied, thanks! [1/2] python3-pyudev: provide native (no commit info) [2/2] lvm2: 2.03.16 -> 2.03.22 commit: 02f460c5e379b3b0980374b3f89d55bc195d03d3 I just check on the git repo, this means that only the lvm2 patch was applied (but not the pyudev one) Maybe this case (partial application of a patch series) could be made more explicit in your template answer? The v2 thread is also replied. I suppose it may be need to skip the revision thread before final version. Regards, Kai Thanks! Best regards, -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107389): https://lists.openembedded.org/g/openembedded-devel/message/107389 Mute This Topic: https://lists.openembedded.org/mt/102992734/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH 1/2] python3-pyudev: provide native
On 12/5/23 22:50, Kai Kang wrote: From: Kai Kang Add 'native' to BBCLASSEXTEND to provides python3-pyudev-native which is required by lvm2 when package config 'dbus' is enabled. Hi Khem, It seems this patch is still in branch master-next, but it has been dropped in the v2 review request. Regards, Kai Signed-off-by: Kai Kang --- meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 6fcf346bc..8bc3afdb5 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -20,3 +20,5 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-fcntl \ libudev \ " + +BBCLASSEXTEND = "native" -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107268): https://lists.openembedded.org/g/openembedded-devel/message/107268 Mute This Topic: https://lists.openembedded.org/mt/102992734/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH v2] lvm2: 2.03.16 -> 2.03.22
From: Kai Kang Update lvm2 from 2.03.16 to 2.03.22. * remove 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch which has done in upstream already * add patch to check egrep & grep * rebase patches * add package config 'dbus' and fix errors about it Signed-off-by: Kai Kang --- v2: * remove check python modules in configure.ac and add them as runtime dependencies in package config 'dbus' setting .../files/0001-configure.ac-check-egrep.patch | 33 +++ ...Guard-use-of-mallinfo-with-__GLIBC__.patch | 29 -- ...tweak-MODPROBE_CMD-for-cross-compile.patch | 10 ++-- ...per_2.03.16.bb => libdevmapper_2.03.22.bb} | 0 meta-oe/recipes-support/lvm2/lvm2.inc | 4 +- ...findmnt-bin-lsblk-bin-sort-not-found.patch | 12 ++-- ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 ++ .../lvm2/lvm2/tweak-for-lvmdbusd.patch| 55 +++ .../lvm2/{lvm2_2.03.16.bb => lvm2_2.03.22.bb} | 19 ++- 9 files changed, 147 insertions(+), 44 deletions(-) create mode 100644 meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch delete mode 100644 meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.16.bb => libdevmapper_2.03.22.bb} (100%) create mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch create mode 100644 meta-oe/recipes-support/lvm2/lvm2/tweak-for-lvmdbusd.patch rename meta-oe/recipes-support/lvm2/{lvm2_2.03.16.bb => lvm2_2.03.22.bb} (79%) diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch new file mode 100644 index 0..474c2f8ac --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch @@ -0,0 +1,33 @@ +configure.ac: check egrep + +The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed +from configure.ac, then it fails to substitute '@EGREP@': + +| [GEN] command-lines-input.h +| /bin/bash: line 2: @EGREP@: command not found +| [GEN] command-count.h + +Call AC_PROG_EGREP to fix the error. + +Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] + +Signed-off-by: Kai Kang +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 2e52498f9..d9462e22c 100644 +--- a/configure.ac b/configure.ac +@@ -78,6 +78,7 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_MKDIR_P + AC_PROG_RANLIB ++AC_PROG_EGREP + AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL(AR, ar) + AC_PATH_TOOL(CFLOW_CMD, cflow) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch deleted file mode 100644 index 1fbaf0c9a..0 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Tue, 25 Oct 2016 11:52:44 + -Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ - -This API is glibc-only - -Signed-off-by: Khem Raj -Signed-off-by: Dengke Du - -Upstream-Status: Pending - - lib/mm/memlock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: LVM2.2.02.177/lib/mm/memlock.c -=== LVM2.2.02.177.orig/lib/mm/memlock.c -+++ LVM2.2.02.177/lib/mm/memlock.c -@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index 517b9a5f2..ed9972a5f 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -21,18 +21,18 @@ Signed-off-by: Hongxu Jia 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e427708..aa374ea 100644 +index b43d8b9be..efe3062c1 100644 --- a/configure.ac +++ b/configure.ac -@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then - fi +@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ + ]) -AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) - - if test -n "$MODPROBE_CMD"; then + AS_IF([test -n "$MODPROBE_CMD"], [ AC_
Re: [oe] [meta-python][PATCH 1/2] python3-pyudev: provide native
On 12/5/23 23:39, Yoann Congal wrote: Hi, Le 05/12/2023 à 15:50, Kai Kang a écrit : From: Kai Kang Add 'native' to BBCLASSEXTEND to provides python3-pyudev-native which is required by lvm2 when package config 'dbus' is enabled. Signed-off-by: Kai Kang --- meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 6fcf346bc..8bc3afdb5 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -20,3 +20,5 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-fcntl \ libudev \ " + +BBCLASSEXTEND = "native" On my setup, this fails with: $ bitbake python3-pyudev-native Loading cache: 100% |##| Time: 0:00:00 Loaded 4996 entries from dependency cache. Parsing recipes: 100% || Time: 0:00:59 Parsing of 3129 .bb files complete (98 cached, 3031 parsed). 4997 targets, 140 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies ERROR: Nothing RPROVIDES 'libudev-native' (but virtual:native:/.../yocto/poky/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb RDEPENDS on or otherwise requires it) NOTE: Runtime target 'libudev-native' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libudev-native'] ERROR: Required build target 'python3-pyudev-native' has no buildable providers. Missing or unbuildable dependency chain was: ['python3-pyudev-native', 'libudev-native'] FYI, the native support was removed precisely to avoid this error on the autobuilder. See: https://git.openembedded.org/meta-openembedded/commit/?id=d4aa17dc436beb96a804860bc6d18cf72283709e In this case, I suppose, we would need to either add -native support for libudev or somehow cut the dependency python3-pyudev->libudev. Maybe this is something you have locally and not pushed yet? Hi Yoann, I am using 'systemd' as init manager and it RPROVIDES libudev-native. I haven't finger out the reason, but I'll try to remove this dependency chain. $ bitbake libudev-native -e >be ERROR: Nothing PROVIDES 'libudev-native'. Close matches: libdnet-native libev-native libuv-native systemd RPROVIDES libudev-native Regards, Kai Regards, -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107232): https://lists.openembedded.org/g/openembedded-devel/message/107232 Mute This Topic: https://lists.openembedded.org/mt/102992734/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH 2/2] lvm2: 2.03.16 -> 2.03.22
From: Kai Kang Update lvm2 from 2.03.16 to 2.03.22. * remove 0002-Guard-use-of-mallinfo-with-__GLIBC__.patch which has done in upstream already * add patch to check egrep & grep * rebase patches * add package config 'dbus' and fix errors about it Signed-off-by: Kai Kang --- .../files/0001-configure.ac-check-egrep.patch | 33 + ...Guard-use-of-mallinfo-with-__GLIBC__.patch | 29 --- ...tweak-MODPROBE_CMD-for-cross-compile.patch | 10 +++--- ...per_2.03.16.bb => libdevmapper_2.03.22.bb} | 0 meta-oe/recipes-support/lvm2/lvm2.inc | 4 +-- ...findmnt-bin-lsblk-bin-sort-not-found.patch | 12 +++ ...1-lvmdbusd-create-dirs-for-lock-file.patch | 29 +++ .../tweak-installation-for-lvmdbusd.patch | 36 +++ .../lvm2/{lvm2_2.03.16.bb => lvm2_2.03.22.bb} | 19 -- 9 files changed, 128 insertions(+), 44 deletions(-) create mode 100644 meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch delete mode 100644 meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch rename meta-oe/recipes-support/lvm2/{libdevmapper_2.03.16.bb => libdevmapper_2.03.22.bb} (100%) create mode 100644 meta-oe/recipes-support/lvm2/lvm2/0001-lvmdbusd-create-dirs-for-lock-file.patch create mode 100644 meta-oe/recipes-support/lvm2/lvm2/tweak-installation-for-lvmdbusd.patch rename meta-oe/recipes-support/lvm2/{lvm2_2.03.16.bb => lvm2_2.03.22.bb} (78%) diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch new file mode 100644 index 0..474c2f8ac --- /dev/null +++ b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch @@ -0,0 +1,33 @@ +configure.ac: check egrep + +The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed +from configure.ac, then it fails to substitute '@EGREP@': + +| [GEN] command-lines-input.h +| /bin/bash: line 2: @EGREP@: command not found +| [GEN] command-count.h + +Call AC_PROG_EGREP to fix the error. + +Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] + +Signed-off-by: Kai Kang +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index 2e52498f9..d9462e22c 100644 +--- a/configure.ac b/configure.ac +@@ -78,6 +78,7 @@ AC_PROG_LN_S + AC_PROG_MAKE_SET + AC_PROG_MKDIR_P + AC_PROG_RANLIB ++AC_PROG_EGREP + AC_CHECK_TOOL([READELF], [readelf]) + AC_CHECK_TOOL(AR, ar) + AC_PATH_TOOL(CFLOW_CMD, cflow) +-- +2.34.1 + diff --git a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch b/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch deleted file mode 100644 index 1fbaf0c9a..0 --- a/meta-oe/recipes-support/lvm2/files/0002-Guard-use-of-mallinfo-with-__GLIBC__.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3ae9c0b607ec33fb07f32a41e9d28cc9068dd39a Mon Sep 17 00:00:00 2001 -From: Dengke Du -Date: Tue, 25 Oct 2016 11:52:44 + -Subject: [PATCH] Guard use of mallinfo() with __GLIBC__ - -This API is glibc-only - -Signed-off-by: Khem Raj -Signed-off-by: Dengke Du - -Upstream-Status: Pending - - lib/mm/memlock.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: LVM2.2.02.177/lib/mm/memlock.c -=== LVM2.2.02.177.orig/lib/mm/memlock.c -+++ LVM2.2.02.177/lib/mm/memlock.c -@@ -151,7 +151,7 @@ static void _touch_memory(void *mem, siz - - static void _allocate_memory(void) - { --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - void *stack_mem; - struct rlimit limit; - int i, area = 0, missing = _size_malloc_tmp, max_areas = 32, hblks; diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch index 517b9a5f2..ed9972a5f 100644 --- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch +++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch @@ -21,18 +21,18 @@ Signed-off-by: Hongxu Jia 1 file changed, 2 deletions(-) diff --git a/configure.ac b/configure.ac -index e427708..aa374ea 100644 +index b43d8b9be..efe3062c1 100644 --- a/configure.ac +++ b/configure.ac -@@ -1791,8 +1791,6 @@ if test "$BUILD_DMFILEMAPD" = yes; then - fi +@@ -1646,8 +1646,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ + ]) -AC_PATH_TOOL(MODPROBE_CMD, modprobe, [], [$PATH_SBIN]) - - if test -n "$MODPROBE_CMD"; then + AS_IF([test -n "$MODPROBE_CMD"], [ AC_DEFINE_UNQUOTED([MODPROBE_CMD], ["$MODPROBE_CMD"], [The path to 'modprobe
[oe] [meta-python][PATCH 1/2] python3-pyudev: provide native
From: Kai Kang Add 'native' to BBCLASSEXTEND to provides python3-pyudev-native which is required by lvm2 when package config 'dbus' is enabled. Signed-off-by: Kai Kang --- meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb index 6fcf346bc..8bc3afdb5 100644 --- a/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb +++ b/meta-python/recipes-devtools/python/python3-pyudev_0.24.1.bb @@ -20,3 +20,5 @@ RDEPENDS:${PN} = "\ ${PYTHON_PN}-fcntl \ libudev \ " + +BBCLASSEXTEND = "native" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107225): https://lists.openembedded.org/g/openembedded-devel/message/107225 Mute This Topic: https://lists.openembedded.org/mt/102992734/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-gnome][PATCH] libnma: remove conflict xml file
From: Kai Kang The file org.gnome.nm-applet.gschema.xml conflicts with the one provided by network-manager-applet, so remove it from libnma and use the one from network-manager-applet. | Error: Transaction test error: | file /usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml conflicts between attempted installs of network-manager-applet-1.34.0-r0.core2_ 64 and libnma-1.10.6-r0.core2_64 Signed-off-by: Kai Kang --- meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb | 5 + 1 file changed, 5 insertions(+) diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index bff9a3360..75b0418c3 100644 --- a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb @@ -27,3 +27,8 @@ EXTRA_OEMESON:append:riscv32 = " -Dvapi=false" EXTRA_OEMESON:append:powerpc64le = " -Dvapi=false" GTKDOC_MESON_OPTION = "gtk_doc" + +do_install:append() { +# conflicts with the file provided by network-manager-applet +rm -f ${D}${datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +} -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#107199): https://lists.openembedded.org/g/openembedded-devel/message/107199 Mute This Topic: https://lists.openembedded.org/mt/102966372/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 1/2] python3-blivet: 3.4.3 -> 3.8.2
From: Kai Kang Update python3-blivet 3.4.3 to 3.8.2 * drop 0004-fix-new.roots-object-is-not-iterable.patch which is not needed any more * adjust indent as well Signed-off-by: Kai Kang --- ...fix-new.roots-object-is-not-iterable.patch | 28 --- ...livet_3.4.3.bb => python3-blivet_3.8.2.bb} | 9 +++--- 2 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch rename meta-python/recipes-extended/python-blivet/{python3-blivet_3.4.3.bb => python3-blivet_3.8.2.bb} (79%) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch b/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch deleted file mode 100644 index 526a3b1fb..0 --- a/meta-python/recipes-extended/python-blivet/python3-blivet/0004-fix-new.roots-object-is-not-iterable.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3bb8d08bdec2f79bb13c0a44b81718d26e5bdabc Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Mon, 8 May 2017 16:30:20 +0800 -Subject: [PATCH 04/11] fix new.roots object is not iterable - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia - blivet/blivet.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/blivet/blivet.py b/blivet/blivet.py -index ea08837..91c92b2 100644 a/blivet/blivet.py -+++ b/blivet/blivet.py -@@ -1206,7 +1206,7 @@ class Blivet(object): - p = partition.disk.format.parted_disk.getPartitionByPath(partition.path) - partition.parted_partition = p - --for root in new.roots: -+for root in new.roots or []: - root.swaps = [new.devicetree.get_device_by_id(d.id, hidden=True) for d in root.swaps] - root.swaps = [s for s in root.swaps if s] - --- -2.7.4 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb b/meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb similarity index 79% rename from meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb rename to meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb index bd57604f2..52b3aa7dc 100644 --- a/meta-python/recipes-extended/python-blivet/python3-blivet_3.4.3.bb +++ b/meta-python/recipes-extended/python-blivet/python3-blivet_3.8.2.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI += "\ file://0002-run_program-support-timeout.patch \ file://0003-support-infinit-timeout.patch \ - file://0004-fix-new.roots-object-is-not-iterable.patch \ file://0005-fix-incorrect-timeout-while-system-time-changed.patch \ file://0006-tweak-btrfs-packages.patch \ file://0007-invoking-mount-with-infinite-timeout.patch \ @@ -17,16 +16,16 @@ SRC_URI += "\ file://0010-invoking-mkfs-with-infinite-timeout.patch \ file://0011-invoking-dd-with-infinite-timeout.patch \ " -SRC_URI[sha256sum] = "1b05b77f3ee35d82c7a577a168c9ba0204d3e9a87eb1975e5f9af47700eeff48" +SRC_URI[sha256sum] = "88d1500c76c4660aec7da9e9aa54f7f574546571b52c07a67e1417883c2cb25b" inherit pypi features_check systemd setuptools3_legacy REQUIRED_DISTRO_FEATURES = "systemd" RDEPENDS:${PN} += "python3-pykickstart python3-pyudev \ - parted python3-pyparted multipath-tools \ - lsof cryptsetup libblockdev \ - libbytesize \ + parted python3-pyparted multipath-tools \ + lsof cryptsetup libblockdev \ + libbytesize \ " FILES:${PN} += " \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105835): https://lists.openembedded.org/g/openembedded-devel/message/105835 Mute This Topic: https://lists.openembedded.org/mt/102336855/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH 2/2] python3-blivetgui: 2.3.0 -> 2.4.2
From: Kai Kang Update python3-blivetgui from 2.3.0 to 2.4.2 * drop patches that there are not needed any more * not set var `B` that out of source tree build is supported * inherit setuptools3 rather than setuptools3_legacy Signed-off-by: Kai Kang --- ...ols-instead-of-distutils-in-setup.py.patch | 30 -- ...Use-symbolic-list-add-and-edit-icons.patch | 56 --- ...ui_2.3.0.bb => python3-blivetgui_2.4.2.bb} | 18 ++ 3 files changed, 5 insertions(+), 99 deletions(-) delete mode 100644 meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch delete mode 100644 meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch rename meta-python/recipes-extended/python-blivet/{python3-blivetgui_2.3.0.bb => python3-blivetgui_2.4.2.bb} (61%) diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch deleted file mode 100644 index c88912bfa..0 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0001-Use-setuptools-instead-of-distutils-in-setup.py.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 54014061be2fed20d6c35aba9719ea70a9fea9ea Mon Sep 17 00:00:00 2001 -From: Vojtech Trefny -Date: Wed, 1 Sep 2021 08:59:19 +0200 -Subject: [PATCH] Use setuptools instead of distutils in setup.py - -The distutils module is deprecated and will be removed in Python -3.12. - -Upstream-Status: Backport [https://github.com/kraj/blivet-gui/commit/54014061be2fed20d6c35aba9719ea70a9fea9ea] - setup.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/setup.py b/setup.py -index aa8ef57..77849a1 100644 a/setup.py -+++ b/setup.py -@@ -1,7 +1,7 @@ - from __future__ import print_function - --from distutils.core import setup --from distutils.command.sdist import sdist -+from setuptools import setup -+from setuptools.command.sdist import sdist - import glob - import sys - --- -2.35.1 - diff --git a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch b/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch deleted file mode 100644 index 3a95859ad..0 --- a/meta-python/recipes-extended/python-blivet/python3-blivetgui/0002-Use-symbolic-list-add-and-edit-icons.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Backport [https://github.com/storaged-project/blivet-gui/commit/eb8ec968] - -Signed-off-by: Kai Kang - -From eb8ec968d1ee8b4b710568b1eb8536296f90751e Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 17 Feb 2022 11:16:22 -0800 -Subject: [PATCH] Use symbolic list-add and edit- icons (Adwaita dropped old - ones) - -adwaita-icon-theme 42 no longer includes the non-symbolic icons -for these names. The choices are to switch to symbolic ones or -carry the non-symbolic ones downstream. - -Signed-off-by: Adam Williamson - blivetgui/list_actions.py | 8 - blivetgui/processing_window.py | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/blivetgui/list_actions.py b/blivetgui/list_actions.py -index b7c1f9c..5388feb 100644 a/blivetgui/list_actions.py -+++ b/blivetgui/list_actions.py -@@ -48,10 +48,10 @@ def __init__(self, blivet_gui): - self.blivet_gui = blivet_gui - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter --icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add", 16, 0) --icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete", 16, 0) --icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all", 16, 0) --icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste", 16, 0) -+icon_add = Gtk.IconTheme.load_icon(icon_theme, "list-add-symbolic", 16, 0) -+icon_delete = Gtk.IconTheme.load_icon(icon_theme, "edit-delete-symbolic", 16, 0) -+icon_edit = Gtk.IconTheme.load_icon(icon_theme, "edit-select-all-symbolic", 16, 0) -+icon_misc = Gtk.IconTheme.load_icon(icon_theme, "edit-paste-symbolic", 16, 0) - - self.action_icons = {"add": icon_add, "delete": icon_delete, "edit": icon_edit, - "misc": icon_misc} -diff --git a/blivetgui/processing_window.py b/blivetgui/processing_window.py -index c400f90..a020ae8 100644 a/blivetgui/processing_window.py -+++ b/blivetgui/processing_window.py -@@ -93,9 +93,9 @@ def add_action_view(self): - """ - - icon_theme = Gtk.IconTheme.get_default() # pylint: disable=no-value-for-parameter --icon_a
[oe] [meta-python][PATCH] python3-nacl: drop duplicate recipe
From: Kai Kang Recipes python3-nacl and python3-pynacl are exactly the same reipces for python packge "PyNaCl", so drop the latter one python3-nacl_1.5.0.bb. And let python3-pynacl rprovides python3-nacl in case it is required by other recipes. Ajust the order in python3-pynacl as well accord to https://docs.yoctoproject.org/dev/contributor-guide/recipe-style-guide.html#recipe-ordering Signed-off-by: Kai Kang --- .../python/python3-nacl_1.5.0.bb | 25 --- .../python/python3-pynacl_1.5.0.bb| 22 2 files changed, 12 insertions(+), 35 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb diff --git a/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb b/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb deleted file mode 100644 index 7d5292745..0 --- a/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" -HOMEPAGE = "https://github.com/pyca/pynacl; -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" - -PYPI_PACKAGE = "PyNaCl" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" - -DEPENDS += "\ -libsodium \ -python3-cffi-native \ -python3-pip-native \ -" - -RDEPENDS:${PN}:class-target += " \ -python3-cffi \ -python3-pycparser \ -" - -export SODIUM_INSTALL = "system" - -BBCLASSEXTEND = "native" \ No newline at end of file diff --git a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb b/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb index 5a8ed131a..0747c67c1 100644 --- a/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb +++ b/meta-python/recipes-devtools/python/python3-pynacl_1.5.0.bb @@ -10,21 +10,11 @@ PYPI_PACKAGE = "PyNaCl" inherit pypi python_setuptools_build_meta -# in meta-virtualization layer -# -RCONFLICTS:${PN} = "python3-nacl" - DEPENDS += "\ ${PYTHON_PN}-cffi-native \ libsodium \ " -RDEPENDS:${PN} = "\ -${PYTHON_PN}-six \ -${PYTHON_PN}-cffi \ -libsodium \ -" - do_compile:prepend() { export SODIUM_INSTALL=system } @@ -32,3 +22,15 @@ do_compile:prepend() { do_install:prepend() { export SODIUM_INSTALL=system } + +RDEPENDS:${PN} = "\ +${PYTHON_PN}-six \ +${PYTHON_PN}-cffi \ +libsodium \ +" + +RPROVIDES:${PN} = "python3-nacl" + +# in meta-virtualization layer +# +RCONFLICTS:${PN} = "python3-nacl" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105814): https://lists.openembedded.org/g/openembedded-devel/message/105814 Mute This Topic: https://lists.openembedded.org/mt/102314205/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH] python3-nacl: Add recipe for the latest release of PyNaCl
On 11/1/23 11:56, Derek Straka wrote: Works for me. I'd personally prefer to keep it in meta-python since I'd rather not create a meta-virtualization dependency for my personal project, but I can be persuaded if it creates more work for others. Yes, it will be kept in meta-python that both of the recipes are in meta-python. Regards, Kai On Tue, Oct 31, 2023 at 10:49 PM Khem Raj wrote: On Tue, Oct 31, 2023 at 7:32 PM Kai wrote: > > On 9/30/23 05:35, Derek Straka wrote: > > Signed-off-by: Derek Straka > > --- > > .../python/python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> | 25 +++ > > 1 file changed, 25 insertions(+) > > create mode 100644 meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> > > > > diff --git a/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> b/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> > > new file mode 100644 > > index 0..7d5292745 > > --- /dev/null > > +++ b/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> > > @@ -0,0 +1,25 @@ > > +SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" > > +HOMEPAGE = "https://github.com/pyca/pynacl <https://urldefense.com/v3/__https://github.com/pyca/pynacl__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW9eTnCX1g$>" > > +LICENSE = "Apache-2.0" > > +LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" > > + > > +PYPI_PACKAGE = "PyNaCl" > > It is exactly the same recipe with name python3-nacl_1.5.0.bb <https://urldefense.com/v3/__http://python3-nacl_1.5.0.bb__;!!AjveYdw8EvQ!cM6NlZF43XGcQqc1vQIYJhJ3jNKput2q3D1rDFp-P_OrzFB0pFRF7WSBw9sofwN0Af1n5o9oAW_t0d6nQw$> in the > same directory. And I suggest to > remove one of them and let the other one rprovides it if needed. this seems fine to me. Please send a patch to remove old recipe and add PROVIDES to new one > > Regards, > Kai > > > > + > > +inherit pypi setuptools3 > > + > > +SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" > > + > > +DEPENDS += "\ > > + libsodium \ > > + python3-cffi-native \ > > + python3-pip-native \ > > +" > > + > > +RDEPENDS:${PN}:class-target += " \ > > + python3-cffi \ > > + python3-pycparser \ > > +" > > + > > +export SODIUM_INSTALL = "system" > > + > > +BBCLASSEXTEND = "native" > > \ No newline at end of file > > > > > > > > -- > Kai Kang > Wind River Linux > -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105813): https://lists.openembedded.org/g/openembedded-devel/message/105813 Mute This Topic: https://lists.openembedded.org/mt/101667089/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH] python3-nacl: Add recipe for the latest release of PyNaCl
On 9/30/23 05:35, Derek Straka wrote: Signed-off-by: Derek Straka --- .../python/python3-nacl_1.5.0.bb | 25 +++ 1 file changed, 25 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb diff --git a/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb b/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb new file mode 100644 index 0..7d5292745 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-nacl_1.5.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Python binding to the Networking and Cryptography (NaCl) library" +HOMEPAGE = "https://github.com/pyca/pynacl; +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8cc789b082b3d97e1ccc5261f8594d3f" + +PYPI_PACKAGE = "PyNaCl" It is exactly the same recipe with name python3-nacl_1.5.0.bb in the same directory. And I suggest to remove one of them and let the other one rprovides it if needed. Regards, Kai + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba" + +DEPENDS += "\ +libsodium \ +python3-cffi-native \ +python3-pip-native \ +" + +RDEPENDS:${PN}:class-target += " \ +python3-cffi \ +python3-pycparser \ +" + +export SODIUM_INSTALL = "system" + +BBCLASSEXTEND = "native" \ No newline at end of file -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105809): https://lists.openembedded.org/g/openembedded-devel/message/105809 Mute This Topic: https://lists.openembedded.org/mt/101667089/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH] xfce4-panel-profiles: 1.0.13 -> 1.0.14
From: Kai Kang Upgrade xfce4-panel-profiles from 1.0.13 to 1.0.14. Drop the patch that it has dropped the creation of the link file already. Signed-off-by: Kai Kang --- .../not-create-link-to-locale.patch | 22 --- ...0.13.bb => xfce4-panel-profiles_1.0.14.bb} | 6 ++--- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch rename meta-xfce/recipes-apps/xfce4-panel-profiles/{xfce4-panel-profiles_1.0.13.bb => xfce4-panel-profiles_1.0.14.bb} (81%) diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch deleted file mode 100644 index b5421f6f7..0 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch +++ /dev/null @@ -1,22 +0,0 @@ -It is useless to create a link to $(PREFIX)/share/locale that there is no -reference to $(PREFIX)/share/$(APPNAME)/locale in source code. - -Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=16693] - -Signed-off-by: Kai Kang - Makefile.in.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.in.in b/Makefile.in.in -index c0ce866..c2f26fe 100644 a/Makefile.in.in -+++ b/Makefile.in.in -@@ -70,7 +70,6 @@ install: all xfce4-panel-profiles.1 - install data/metainfo/*.xml $(DESTDIR)/$(PREFIX)/share/metainfo - - cp -rf locale $(DESTDIR)/$(PREFIX)/share -- ln -sf $(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale - - install -d $(DESTDIR)/$(MANDIR)/man1 - install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.14.bb similarity index 81% rename from meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb rename to meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.14.bb index feb912160..38f6eb6eb 100644 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.14.bb @@ -9,10 +9,8 @@ REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" DEPENDS += "intltool-native" -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ - file://not-create-link-to-locale.patch \ - " -SRC_URI[sha256sum] = "bc387c13f94109422dc72b0fcb919b0dc11619ba589d03e492252b0d2513b170" +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2; +SRC_URI[sha256sum] = "6d08354e8c44d4b0370150809c1ed601d09c8b488b68986477260609a78be3f9" do_configure() { # special configure - no autotools... -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#105800): https://lists.openembedded.org/g/openembedded-devel/message/105800 Mute This Topic: https://lists.openembedded.org/mt/102292551/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] ostree: not compatible with riscv32 when ptest enabled
From: Kai Kang ostree-ptest rdepends on strace which is not compatible with riscv32. So when ptest is enabled, set ostree not compatible with riscv32. Signed-off-by: Kai Kang --- meta-oe/recipes-extended/ostree/ostree_2023.5.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-extended/ostree/ostree_2023.5.bb b/meta-oe/recipes-extended/ostree/ostree_2023.5.bb index 3028c4c92..bc465dd62 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2023.5.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2023.5.bb @@ -28,6 +28,8 @@ S = "${WORKDIR}/libostree-${PV}" inherit autotools bash-completion gobject-introspection github-releases gtk-doc manpages pkgconfig ptest-gnome systemd +COMPATIBLE_HOST:riscv32 = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'null', 'riscv32', d)}" + UNKNOWN_CONFIGURE_OPT_IGNORE = "--disable-introspection --enable-introspection" # Workaround compile failure: -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#104862): https://lists.openembedded.org/g/openembedded-devel/message/104862 Mute This Topic: https://lists.openembedded.org/mt/101352005/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] libmcrypt: fix multilib conflict
From: Kai Kang It fails to install libmcrypt-dev and lib32-libmcrypt-dev at same time: Error: Transaction test error: file /usr/bin/libmcrypt-config conflicts between attempted installs of libmcrypt-dev-2.5.8-r0.core2_64 and lib32-libmcrypt-dev-2.5.8-r0.i586 Use MULTILIB_SCRIPTS from multilib_script.bbclass to handle them. Signed-off-by: Kai Kang --- meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb index a3d09c7cb..cfa056d71 100644 --- a/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb +++ b/meta-oe/recipes-crypto/libmcrypt/libmcrypt_2.5.8.bb @@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d2 UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcrypt/files/Libmcrypt/; UPSTREAM_CHECK_REGEX = "Libmcrypt/(?P\d+(\.\d+)+)/" -inherit autotools-brokensep gettext binconfig +inherit autotools-brokensep gettext binconfig multilib_script CFLAGS += "-Wno-error=implicit-int" @@ -28,3 +28,5 @@ do_configure() { } CLEANBROKEN = "1" + +MULTILIB_SCRIPTS = "${PN}-dev:${bindir}/libmcrypt-config" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#104687): https://lists.openembedded.org/g/openembedded-devel/message/104687 Mute This Topic: https://lists.openembedded.org/mt/101087851/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH v2] fltk-native: fix libdl link issue
From: Kai Kang It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: | /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': | Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' | /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': | Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' The original fix in fltk-native recipe does not work any more because '-ldl' appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have been moved to libc.so since glibc 2.34 via the commits in glibc: 0c1c3a771e dlfcn: Move dlopen into libc add8d7ea01 dlfcn: Move dlvsym into libc 6dfc0207eb dlfcn: Move dlinfo into libc 492560a32e dlfcn: Move dladdr1 into libc 6a1ed32789 dlfcn: Move dlmopen into libc 77f876c0e3 dlfcn: Move dlsym into libc 602252b553 dlfcn: Move dladdr into libc d8cce17d2a dlfcn: Move dlclose into libc Append 'dl' to fltk link items explictly to fix the error. Signed-off-by: Kai Kang --- v2: * add Upstream-Status meta-oe/recipes-support/fltk/fltk-native.bb | 5 +-- .../fltk/fltk/fltk-native-link-libdl.patch| 44 +++ 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 8d3992a6e..3e8e2cdf7 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -15,9 +17,6 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_XCURSOR=OFF \ " -# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' -LDFLAGS += "-ldl" - do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0..e140ce216 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,44 @@ +Upstream-Status: Inappropriate [cross build specific] + +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ### + -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103825): https://lists.openembedded.org/g/openembedded-devel/message/103825 Mute This Topic: https://lists.openembedded.org/mt/100094802/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] fltk-native: fix libdl link issue
From: Kai Kang It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: | /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': | Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' | /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': | Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' The original fix in fltk-native recipe does not work any more because '-ldl' appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have been moved to libc.so since glibc 2.34 via the commits in glibc: 0c1c3a771e dlfcn: Move dlopen into libc add8d7ea01 dlfcn: Move dlvsym into libc 6dfc0207eb dlfcn: Move dlinfo into libc 492560a32e dlfcn: Move dladdr1 into libc 6a1ed32789 dlfcn: Move dlmopen into libc 77f876c0e3 dlfcn: Move dlsym into libc 602252b553 dlfcn: Move dladdr into libc d8cce17d2a dlfcn: Move dlclose into libc Append 'dl' to fltk link items explictly to fix the error. Signed-off-by: Kai Kang --- meta-oe/recipes-support/fltk/fltk-native.bb | 5 +-- .../fltk/fltk/fltk-native-link-libdl.patch| 42 +++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 8d3992a6e..3e8e2cdf7 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -15,9 +17,6 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_XCURSOR=OFF \ " -# lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): undefined reference to symbol 'dlsym@@GLIBC_2.2.5' -LDFLAGS += "-ldl" - do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0..55bbd2439 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -0,0 +1,42 @@ +It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31: + +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)': +| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen' +| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()': +| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror' + +The original fix in fltk-native recipe does not work any more because '-ldl' +appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it +doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have +been moved to libc.so since glibc 2.34 via the commits in glibc: + +0c1c3a771e dlfcn: Move dlopen into libc +add8d7ea01 dlfcn: Move dlvsym into libc +6dfc0207eb dlfcn: Move dlinfo into libc +492560a32e dlfcn: Move dladdr1 into libc +6a1ed32789 dlfcn: Move dlmopen into libc +77f876c0e3 dlfcn: Move dlsym into libc +602252b553 dlfcn: Move dladdr into libc +d8cce17d2a dlfcn: Move dlclose into libc + +Append 'dl' to fltk link items explictly to fix the error. + +Signed-off-by: Kai Kang + +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index d153b1c..0fe5c11 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -306,7 +306,7 @@ endif (USE_XFT) + ### + + FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") +-target_link_libraries (fltk ${OPTIONAL_LIBS}) ++target_link_libraries (fltk ${OPTIONAL_LIBS} dl) + + ### + -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103738): https://lists.openembedded.org/g/openembedded-devel/message/103738 Mute This Topic: https://lists.openembedded.org/mt/100094287/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-gnome][PATCH] libtimezonemap: rename downloaded file name
From: Kai Kang Add parameter 'downloadfilename' to SRC_URI to keep the downloaded file name as same as before. Signed-off-by: Kai Kang --- meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb index 00d66b418..bafe7af04 100644 --- a/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb +++ b/meta-gnome/recipes-gnome/libtimezonemap/libtimezonemap_0.4.6.bb @@ -4,7 +4,7 @@ SECTION = "devel/lib" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz" +SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz;downloadfilename=${BP}.tar.gz" SRC_URI[sha256sum] = "0d634cc2476d8f57d1ee1864bd4f442180ae4bf040a9ae4bf73b66bbd85d7195" DEPENDS = "gtk+3 gdk-pixbuf libsoup-2.4 json-glib gnome-common-native" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#103623): https://lists.openembedded.org/g/openembedded-devel/message/103623 Mute This Topic: https://lists.openembedded.org/mt/99825679/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 4/4] xfce4-screensaver: 4.16.0 -> 4.18.1
From: Kai Kang Update xfce4-screensaver from 4.16.0 to 4.18.1 * rebase fix-cross-compile.patch Release notes for 4.18.1 This release is to fix a build issue on BSD systems - Refactor spawn_make_environment_for_display() Release notes for 4.18.0 - Add copyright notice to configure.ac - Make missing GNOME Keyring PAM module warning quiet (Fixes #46) - build: Fix --disable-locking (Fixes #83) - Remove duplicated lines in README (Fixes #109) - savers: Fix critical warnings on exit - savers: Fix critical warnings from GSThemeWindow on "realize" - Do not redirect stderr for our own commands - Round the user picture on lock dialog. - build: Do not warn if PAM prefix is correct - Improve lightdm detection (Fixes #39) - build: Fix -Wunused-value compiler warning - build: Fix -Wdeclaration-after-statement compiler warning - build: Fix -Wsign-compare compiler warning - build: Use XDT_FEATURE_DEBUG - Fix use-after-free crash in xfce4-screensaver-dialog - Fix D-Bus sleep inhibit when screen locker is disabled - Complete previous commit - Fix Xfconf memory management - build: Set GLib macros via XDT_CHECK_PACKAGE - autogen.sh: Do not `mkdir m4` - Fix crash when XDG_PICTURES_DIR is not set (Fixes #86) - Fix build warning from Clang - --with-password-helper expects full pathname of password helper - Add missing zeroing of timeout_id in dialog_timed_out() timer handler - Fix wrong signal name for GtkSpinButton - Remove ENABLE_NLS ifdefs and use xfce_textdomain() - build: Fix intltool lock file problem during make distcheck - Fix compilation warnings - autoconf: Some updates - Translation Updates: Albanian, Armenian (Armenia), Basque, Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Danish, Dutch, Eastern Armenian, English (Australia), Estonian, Finnish, French, Galician, German, Hebrew, Hungarian, Icelandic, Indonesian, Italian, Japanese, Kabyle, Korean, Lithuanian, Malay, Norwegian Bokmål, Polish, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Ukrainian Signed-off-by: Kai Kang --- .../xfce4-screensaver/fix-cross-compile.patch | 14 +- ...saver_4.16.0.bb => xfce4-screensaver_4.18.1.bb} | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) rename meta-xfce/recipes-apps/xfce4-screensaver/{xfce4-screensaver_4.16.0.bb => xfce4-screensaver_4.18.1.bb} (91%) diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch index f726064e2..eabcaaae6 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -6,11 +6,15 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Kai Kang +--- + configure.ac | 24 + 1 file changed, 12 insertions(+), 12 deletions(-) + diff --git a/configure.ac b/configure.ac -index f0ec537..05c393d 100644 +index 6f149bb..3890677 100644 --- a/configure.ac +++ b/configure.ac -@@ -230,9 +230,9 @@ dnl --- +@@ -237,9 +237,9 @@ dnl --- # AC_DEFUN([AC_CHECK_X_HEADER], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -23,7 +27,7 @@ index f0ec537..05c393d 100644 CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_HEADER([$1],[$2],[$3],[$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ +@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ # AC_DEFUN([AC_TRY_X_COMPILE], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -34,9 +38,9 @@ index f0ec537..05c393d 100644 +#CPPFLAGS="$CPPFLAGS -I$includedir" +# fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ +@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb similarity index 91% rename from meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb rename to meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb index 685c4c1f6..2c5cba0d8 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb @@ -13,7 +13,7 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver
[oe] [meta-xfce][PATCH 1/4] thunar-archive-plugin: 0.5.0 -> 0.5.1
From: Kai Kang Release notes for 0.5.1 === Bugfix and translation release Fixes: - Fix use-after-free crash in "tap_provider_child_watch_destroy" - build: Add GLib requirement - build: Fix autotools warnings - Use generic package icon name in dialog header Translation Updates: English (Canada), Greek, Persian (Iran), Russian Signed-off-by: Kai Kang --- ...r-archive-plugin_0.5.0.bb => thunar-archive-plugin_0.5.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-thunar-plugins/archive/{thunar-archive-plugin_0.5.0.bb => thunar-archive-plugin_0.5.1.bb} (82%) diff --git a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.0.bb b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.1.bb similarity index 82% rename from meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.0.bb rename to meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.1.bb index c2c4b9fa5..044a39a3c 100644 --- a/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.0.bb +++ b/meta-xfce/recipes-thunar-plugins/archive/thunar-archive-plugin_0.5.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" inherit thunar-plugin -SRC_URI[sha256sum] = "8eca88a358282a5acdea72984db0d930efdf658b4bc5b82ef7bcd06224366ffa" +SRC_URI[sha256sum] = "a81b3ab1d3cd77c7b3d6db15b37a3c12d65b06e373edc3c21083f02d605d8bed" # install tap files in ${libdir}/thunar-archive-plugin EXTRA_OECONF += "--libexecdir=${libdir}" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102123): https://lists.openembedded.org/g/openembedded-devel/message/102123 Mute This Topic: https://lists.openembedded.org/mt/98314617/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 2/4] garcon: 4.18.0 -> 4.18.1
From: Kai Kang Add GFDL-1.1-no-invariants-only to LICENSE since it states in license file 'COPYING' [1]: garcon's source code is licensed under the LGPLv2, while its documentation is licensed under the GFDL 1.1 (with no invariant sections). Release notes for 4.18.1 - garcon-gtk: Add missing lock when filling the GtkMenu - Wait for any async operation to finish before releasing locks - Use GIcons for menu icons instead of loading surfaces - Revert "garcon-gtk: Fix menu icon blurriness when UI scale factor != 1" - Revert "Load icons using icon theme scaling functions correctly" - garcon-gtk: Properly update GtkMenu is_populated state - Load icons using icon theme scaling functions correctly - Translation Updates: Albanian, Amharic, Arabic, Armenian, Armenian (Armenia), Asturian, Basque, Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (United Kingdom), Esperanto, Estonian, Finnish, French, Galician, Georgian, German, Greek, Hebrew, Hindi, Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, Kabyle, Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, Spanish, Swedish, Telugu, Thai, Turkish, Ukrainian, Uyghur, Uzbek, Uzbek (Latin), Welsh [1]: https://gitlab.xfce.org/xfce/garcon/-/blob/master/COPYING#L2 Signed-off-by: Kai Kang --- .../garcon/{garcon_4.18.0.bb => garcon_4.18.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-xfce/garcon/{garcon_4.18.0.bb => garcon_4.18.1.bb} (82%) diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.18.1.bb similarity index 82% rename from meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb rename to meta-xfce/recipes-xfce/garcon/garcon_4.18.1.bb index 6a1ee7b7f..c139bfd4c 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.18.1.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce Menu Library" SECTION = "x11/libs" -LICENSE = "LGPL-2.0-only" +LICENSE = "LGPL-2.0-only & GFDL-1.1-no-invariants-only" LIC_FILES_CHKSUM = "file://COPYING;md5=04a01abcbdabffae1ca26335a293276b" DEPENDS = "xfce4-dev-tools-native libxfce4ui intltool-native" @@ -11,7 +11,7 @@ inherit xfce gtk-doc gobject-introspection features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14" +SRC_URI[sha256sum] = "fe7a932a6dac95eb1438f3fbfd53096756ff2e1cb179d10d0fb796cefbb4c20b" EXTRA_OECONF = "--disable-gtk-doc" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102122): https://lists.openembedded.org/g/openembedded-devel/message/102122 Mute This Topic: https://lists.openembedded.org/mt/98314616/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 3/4] xfce4-power-manager: 4.18.0 -> 4.18.1
From: Kai Kang Release notes for 4.18.1 - Update copyright year - Use XfceScreensaver from Libxfce4ui (!33) - screensaver: Fall back on lock command if D-Bus call failed (#142, !24) - panel-plugin: Properly disconnect signal handler - build: Fix autotools warnings - Fix management of source ids - panel-plugin: Add missing ref on image - Fix blurriness in icons when UI scale factor > 1 (!30) - Translation Updates: Chinese (China), English (Canada), Greek, Korean, Turkish Signed-off-by: Kai Kang --- ...e4-power-manager_4.18.0.bb => xfce4-power-manager_4.18.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_4.18.0.bb => xfce4-power-manager_4.18.1.bb} (93%) diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb similarity index 93% rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb index f61c9cd6a..f7f72356d 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.1.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[sha256sum] = "2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a" +SRC_URI[sha256sum] = "6b08b10c4cb7516377dbd32c6cc2296a9faf47022c555f11e75b38fde14aff03" EXTRA_OECONF = " \ --enable-network-manager \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102124): https://lists.openembedded.org/g/openembedded-devel/message/102124 Mute This Topic: https://lists.openembedded.org/mt/98314618/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 5/5] xfce4-settings: 4.18.0 -> 4.18.2
From: Kai Kang Update xfce4-settings from 4.18.0 to 4.18.2 * rebase 0001-xsettings.xml-Set-default-themes.patch Release notes for 4.18.2 - Update copyright year - mime-settings: Increase dialog size (!96) - display: fix blurry 'help' indicator on output (#400, !95) - display: fix blurry icon in profiles treeview - display: fix blurry icons in minimal display settings dialog - mime: fix blurry icons in default app menus - mouse: fix blurriness in cursor theme previews - appearance: fix blurry subpixel antialias icons - appearance: fix blurry icon theme previews - xfsettingsd: Make xsettings.xml well-formed (Fixes #431, !94) - xfsettingsd: Remove duplicated config line (Fixes #425) - Translation Updates: Albanian, Chinese (China), Dutch, English (Canada), English (United Kingdom), Finnish, Greek, Korean, Portuguese (Brazil), Turkish Release notes for 4.18.1 Bugfix release on the Xfce-4.18 branch. Here the changelog: Bugfixes: - xfsettingsd: Make CSD (client side decorations) for dialogs opt-in Translation Updates: Albanian, Arabic, Armenian (Armenia), Asturian, Basque, Belarusian, Belarusian (Tarask), Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (Canada), English (United Kingdom), Estonian, Finnish, French, Galician, Georgian, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, Kabyle, Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur Signed-off-by: Kai Kang --- .../files/0001-xsettings.xml-Set-default-themes.patch | 6 +++--- .../{xfce4-settings_4.18.0.bb => xfce4-settings_4.18.2.bb} | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.18.0.bb => xfce4-settings_4.18.2.bb} (93%) diff --git a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch index 274454c01..3a4c00913 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch +++ b/meta-xfce/recipes-xfce/xfce4-settings/files/0001-xsettings.xml-Set-default-themes.patch @@ -22,11 +22,11 @@ Signed-off-by: Kai Kang 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml -index 65ba1ee..9efb3cd 100644 +index d8fe2ac..0f5246b 100644 --- a/xfsettingsd/xsettings.xml +++ b/xfsettingsd/xsettings.xml -@@ -1,8 +1,8 @@ - +@@ -6,8 +6,8 @@ + - diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb similarity index 93% rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb index 0692970f7..0a182273b 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.2.bb @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d" +SRC_URI[sha256sum] = "4661361087faae57efb49741ffcf90bf9078760e163bbdef63b924083bdc4f22" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102072): https://lists.openembedded.org/g/openembedded-devel/message/102072 Mute This Topic: https://lists.openembedded.org/mt/98235327/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 2/5] libxfce4ui: 4.18.0 -> 4.18.3
From: Kai Kang Release notes for 4.18.3 - Add comment about the need for gtk_widget_destroy() - Fix memory management in Vala generated code - Add annotation "(nullable)" where appropriate - Replace deprecated annotation: "(allow-none)" - Harden xfce_gtk_handle_tab_accels (thunar#1067) - screensaver: Avoid Xfconf warning - shortcuts-grabber: Ignore keyboard layout change - screensaver: Fix Xfconf memory management Release notes for 4.18.2 - Update copyright year - Add XfceScreensaver (!89) - docs: Fix broken links - shortcut-dialog: Use parent window for the grab if possible (Fixes #52) - Fix memory leak - Fix memory leaks Release notes for 4.18.1 Bugfix release on the 4.18 branch - XfceFileNameInput - wrap error message (Issue #60) - xfce4-about: Removed excess square brackets - Revert "XfceShortcutsGrabber: Detect auto-repeat key press" - Translation Updates: Hebrew, Russian, Swedish Signed-off-by: Kai Kang --- .../libxfce4ui/{libxfce4ui_4.18.0.bb => libxfce4ui_4.18.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.18.0.bb => libxfce4ui_4.18.3.bb} (92%) diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.3.bb similarity index 92% rename from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb rename to meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.3.bb index 7ff9d1b12..417858c98 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.3.bb @@ -12,7 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # TODO: Check if 0001-... can go SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" -SRC_URI[sha256sum] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b" +SRC_URI[sha256sum] = "afa3a46eeed3ab612d2f7e1308edaf5819f6c33ccc16c13080efabd58f010abd" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" EXTRA_OECONF += "--disable-vala" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102069): https://lists.openembedded.org/g/openembedded-devel/message/102069 Mute This Topic: https://lists.openembedded.org/mt/98235324/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 4/5] xfce4-panel: 4.18.0 -> 4.18.3
From: Kai Kang Update xfce4-panel from 4.18.0 to 4.18.3 * rebase 2 patches Release notes for 4.18.3 - launcher: Show action menu also when there are several items - Fix memory management of vala generated plugins - panel: Rephrase "Don't reserve space on borders" (V2) - panel: Make property migration generic - launcher: Avoid "no trigger event" warning when showing the menu - launcher: Guard access to the plugin menu GdkWindow - libxfce4panel: Unregister menu also on GtkWidget::hide - panel: Do not reset output name if a monitor does not have a model name - libxfce4panel: Fix memory management of source for menu positioning - panel: Delay removal of ExternalPlugin to prevent use-after-free - systray: Cancel any async D-Bus operation in finalize() - tasklist: Do not try to resolve /proc/pid/exe to launch new instance - Translation Updates: Albanian, Arabic, Armenian (Armenia), Asturian, Basque, Belarusian, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (United Kingdom), Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500), Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese Release notes for 4.18.2 - directorymenu: Add missing sanity check - panel: Properly handle null string as property default value - Revert "Use RGBA visual only if compositing is enabled (Fixes #251)" (#672) - Revert "systray: Do not require compositing to be enabled to use RGBA visual" - systray: Fix blurry icons in prefs dialog when UI scale 1 - launcher: Fix blurry icons in prefs and add dialogs when UI scale 1 - launcher: Use GIcon for the tooltip icon (#674) - pager: Use WnckHandle if available (#695) - Translation Updates: Albanian, Finnish, Greek, Italian, Portuguese, Slovenian Release notes for 4.18.1 - Update copyright year - tasklist: Fix scrolling through window buttons (Fixes #692) - tasklist: Fix group button visibility - libxfce4panel: Deprecate XfcePanelImage - tasklist: Do not duplicate menu item activation - clock: Fix sync timeout - docs: Fix version for xfce_panel_set_image_from_source() - clock: Add missing sanity check - windowmenu: Adapt wnck default icon size when UI scale 1 (Fixes #682) - tasklist: Adapt wnck default icon size when UI scale 1 (Fixes #681) - tasklist: Fix window count positioning when UI scale 1 - tasklist: Keep icon pixbuf around and use surface also for menu items - clock: Do not override custom font formats - Translation Updates: Albanian, Amharic, Arabic, Armenian (Armenia), Asturian, Basque, Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (United Kingdom), Estonian, Finnish, French, Galician, Georgian, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, Kazakh, Korean, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500), Panjabi (Punjabi), Polish, Portuguese, Portuguese (Brazil), Romanian, Russian, Serbian, Sinhala, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese Signed-off-by: Kai Kang --- ...enu-do-not-display-desktop-icon-when-no-windo.patch | 10 +- .../files/0002-use-lxdm-to-replace-dm-tool.patch | 10 +++--- .../{xfce4-panel_4.18.0.bb => xfce4-panel_4.18.3.bb} | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.18.0.bb => xfce4-panel_4.18.3.bb} (94%) diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 10c456f45..154f72d18 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -14,7 +14,7 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller -Rebase for xfce4 4.18.0. +Rebase for xfce4-panel 4.18.3. Signed-off-by: Kai Kang --- @@ -22,10 +22,10 @@ Signed-off-by: Kai Kang 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index ba245a3..f8fdee8 100644 +index be7dea4..2f432b0 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -250,7 +250,7 @@ window_menu_plugin_ini
[oe] [meta-xfce][PATCH 3/5] xfce4-session: 4.18.0 -> 4.18.2
From: Kai Kang Release notes for 4.18.2 - manager: Fix GQueue memory management - Fix Xfconf memory management - Update bug report address - Fix suspend/hibernation bug on ConsoleKit2 (Fixes #164) Release notes for 4.18.1 - Update copyright year - Fix bus name acquisition/ownership (#54, !34) - Use XfceScreensaver from Libxfce4ui (!35) - build: Fix previous commit - build: Fix autotools warnings - Avoid duplicating directories in the tail of $XDG_* envs (#111, !21) - settings: Fix memory leak - libxfsm: Fix wrong return value - Fix memory leaks when opening xfce4-session-settings - Fix blurry session snapshots (!33) - Fix blurry icons in autostart tab when UI scale > 1 (!33) - build: Fix GTK deprecation warnings (!32) - build: Fix some other GDK deprecation warnings (!32) - build: Fix gdk_error_trap_push/pop() deprecation warnings (!32) - build: Let xdt-depends.m4 macros set GLib macros (!32) - build: Remove GDK_VERSION_MIN_REQUIRED/MAX_ALLOWED (!32) - Make use of translations for run hooks (Fixes #156) - Translation Updates: Greek, Portuguese, Turkish Signed-off-by: Kai Kang --- .../{xfce4-session_4.18.0.bb => xfce4-session_4.18.2.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.18.0.bb => xfce4-session_4.18.2.bb} (91%) diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb similarity index 91% rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb rename to meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb index 25d30cebe..4021243e4 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.2.bb @@ -8,7 +8,7 @@ DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" inherit xfce update-alternatives features_check SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f" +SRC_URI[sha256sum] = "01ff7fe8d4c2091adefc2925c6b7bb93152ba0732e95c9b9e64d8207fdbdeb8a" REQUIRED_DISTRO_FEATURES = "x11" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102070): https://lists.openembedded.org/g/openembedded-devel/message/102070 Mute This Topic: https://lists.openembedded.org/mt/98235325/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 1/5] libxfce4util: 4.18.0 -> 4.18.1
From: Kai Kang Release notes for 4.18.1 - Handle remaining escape sequences - Fix desktop entry value escaping Signed-off-by: Kai Kang --- .../{libxfce4util_4.18.0.bb => libxfce4util_4.18.1.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/libxfce4util/{libxfce4util_4.18.0.bb => libxfce4util_4.18.1.bb} (75%) diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.1.bb similarity index 75% rename from meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb rename to meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.1.bb index 3dd1f55b4..683f6c337 100644 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.1.bb @@ -6,4 +6,4 @@ DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" inherit xfce gtk-doc gobject-introspection vala -SRC_URI[sha256sum] = "1157ca717fd3dd1da7724a6432a4fb24af9cd922f738e971fd1fd36dfaeac3c9" +SRC_URI[sha256sum] = "8a52063a5adc66252238cad9ee6997909b59983ed21c77eb83c5e67829d1b01f" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102068): https://lists.openembedded.org/g/openembedded-devel/message/102068 Mute This Topic: https://lists.openembedded.org/mt/98235323/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-xfce][PATCH 4/4] xfce4-screenshooter: 1.9.10 -> 1.10.3
On 4/10/23 14:36, Khem Raj wrote: On Sun, Apr 9, 2023 at 10:36 PM Kai wrote: On 4/7/23 23:41, Khem Raj wrote: On Fri, Apr 7, 2023 at 2:17 AM Kai Kang wrote: From: Kai Kang Update xfce4-screenshooter from 1.9.10 to 1.10.3 * update HOMEPAGE that goodies.xfce.org has been decommissioning * content of license file has been updated Its vague and does not state what has changed. Can you add some more info towards what has changed ? Hi Khem, According to https://gitlab.xfce.org/apps/xfce4-screenshooter/-/issues/70 The current license for this component is out of date. Please see xfce4-taskmanager Issue #49 for additional details & discussion. Briefly: Comparing the 17 years old file with the new one, we have: - some whitespace changes - a new FSF address - some extra commas All references to GNU Library General Public License have been replaced with GNU Lesser General Public License This info would have been good in the commit message. OK. I'll add such info next time since it seems you have merged it. Regards, Kai Regards, Kai Signed-off-by: Kai Kang --- ...creenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} (66%) diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb similarity index 66% rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb index bb44ec782..10427dab3 100644 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb @@ -1,13 +1,13 @@ SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter; +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start; SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" inherit xfce-app perlnative -SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" +SRC_URI[sha256sum] = "a454159847becfeca274a5b58c0e5817d4a260a29345a37bbc3b4ff46f8f3818" do_compile:prepend() { mkdir -p lib -- 2.17.1 -- Kai Kang Wind River Linux -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102052): https://lists.openembedded.org/g/openembedded-devel/message/102052 Mute This Topic: https://lists.openembedded.org/mt/98121607/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 2/2] thunar: 4.18.0 -> 4.18.4
From: Kai Kang Release notes for 4.18.4 Bugfix and translation release on the 4.18 branch Bugfixes: - Don't open folder when mounting device (Issue #919) - Don't show full menu for unmounted devices (#1049) - Support handling URIs via desktop file (#1044) - Focus correct split pane on mouse click (#1039) - Prevent wrong undo/redo notify (#1036) - Support undo trash for linked paths (#1030) - Always ask before delete files via undo (#1027) - Fix use after free fault (#1031) - Allow symlink creation on remote locations (#875) - Prevent crash when closing window (#884) - Keep directory specific sort details (#1017) - Don't add extra-dot when creating links (#1019) Translation Updates: Albanian, Arabic, Armenian, Armenian (Armenia), Asturian, Basque, Belarusian, Bengali, Bulgarian, Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish, Dutch, Eastern Armenian, English (Australia), English (United Kingdom), Estonian, Finnish, French, Galician, German, Greek, Hebrew, Hungarian, Icelandic, Indonesian, Interlingue, Italian, Japanese, Kazakh, Korean, Latvian, Malay, Norwegian Bokmål, Norwegian Nynorsk, Occitan (post 1500), Persian (Iran), Polish, Portuguese, Portuguese (Brazil), Romanian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian, Uyghur, Vietnamese Signed-off-by: Kai Kang --- .../recipes-xfce/thunar/{thunar_4.18.0.bb => thunar_4.18.4.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/thunar/{thunar_4.18.0.bb => thunar_4.18.4.bb} (92%) diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.18.4.bb similarity index 92% rename from meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb rename to meta-xfce/recipes-xfce/thunar/thunar_4.18.4.bb index 508416b03..921dba063 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.18.4.bb @@ -10,7 +10,7 @@ inherit xfce gobject-introspection features_check mime-xdg perlnative # cairo would at least needed to be built with xlib. ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "d1f4b080c97b9e390eff199c7562fb20f031686f8d5ee5207e953bfc2feb" +SRC_URI[sha256sum] = "c4463ce2fb1d628adce70a828e8b4de5fa0802236894d2c40f749471619bedcc" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102030): https://lists.openembedded.org/g/openembedded-devel/message/102030 Mute This Topic: https://lists.openembedded.org/mt/98174949/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 1/2] thunar-media-tags-plugin: 0.3.0 -> 0.4.0
From: Kai Kang Update thunar-media-tags-plugin from 0.3.0 to 0.4.0 * update HOMEPAGE * the license file is out of date and has been updated to latest GPL2 text [1] [1]: https://gitlab.xfce.org/thunar-plugins/thunar-media-tags-plugin/-/commit/e206959 Signed-off-by: Kai Kang --- ...s-plugin_0.3.0.bb => thunar-media-tags-plugin_0.4.0.bb} | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) rename meta-xfce/recipes-thunar-plugins/media-tags/{thunar-media-tags-plugin_0.3.0.bb => thunar-media-tags-plugin_0.4.0.bb} (35%) diff --git a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb similarity index 35% rename from meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb rename to meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb index 06695f694..00afa2bbb 100644 --- a/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.3.0.bb +++ b/meta-xfce/recipes-thunar-plugins/media-tags/thunar-media-tags-plugin_0.4.0.bb @@ -1,11 +1,10 @@ SUMMARY = "Adds ID3/OGG tag support to the Thunar bulk rename dialog" -HOMEPAGE = "http://thunar.xfce.org; +HOMEPAGE = "https://docs.xfce.org/xfce/thunar/media-tags; LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit thunar-plugin DEPENDS += "taglib" -SRC_URI[md5sum] = "5e332113e4b0e548ee7abd87629667f7" -SRC_URI[sha256sum] = "e265c4415abac40337cc5566c6f706efcf0be4e97723abe22ba8b874c93a591b" +SRC_URI[sha256sum] = "9592111e11699e449c1fbd5f72d1633ef39b00f17a988cd251ba228dab4fc90a" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102029): https://lists.openembedded.org/g/openembedded-devel/message/102029 Mute This Topic: https://lists.openembedded.org/mt/98174948/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-xfce][PATCH 4/4] xfce4-screenshooter: 1.9.10 -> 1.10.3
On 4/7/23 23:41, Khem Raj wrote: On Fri, Apr 7, 2023 at 2:17 AM Kai Kang wrote: From: Kai Kang Update xfce4-screenshooter from 1.9.10 to 1.10.3 * update HOMEPAGE that goodies.xfce.org has been decommissioning * content of license file has been updated Its vague and does not state what has changed. Can you add some more info towards what has changed ? Hi Khem, According to https://gitlab.xfce.org/apps/xfce4-screenshooter/-/issues/70 The current license for this component is out of date. Please see xfce4-taskmanager Issue #49 for additional details & discussion. Briefly: Comparing the 17 years old file with the new one, we have: - some whitespace changes - a new FSF address - some extra commas All references to GNU Library General Public License have been replaced with GNU Lesser General Public License Regards, Kai Signed-off-by: Kai Kang --- ...creenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} (66%) diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb similarity index 66% rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb index bb44ec782..10427dab3 100644 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb @@ -1,13 +1,13 @@ SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter; +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start; SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" inherit xfce-app perlnative -SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" +SRC_URI[sha256sum] = "a454159847becfeca274a5b58c0e5817d4a260a29345a37bbc3b4ff46f8f3818" do_compile:prepend() { mkdir -p lib -- 2.17.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102003): https://lists.openembedded.org/g/openembedded-devel/message/102003 Mute This Topic: https://lists.openembedded.org/mt/98121607/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-xfce][PATCH 1/4] xfce4-notifyd: 0.6.3 -> 0.8.2
On 4/7/23 23:42, Khem Raj wrote: On Fri, Apr 7, 2023 at 2:17 AM Kai Kang wrote: From: Kai Kang Update xfce4-notifyd from 0.6.3 to 0.8.2 * update HOMEPAGE that goodies.xfce.org has been decommissioned * the content of license file has been updated but license not changed * patch for configure.ac to get the absolute path of pkg-config variables * drop dependencies dbus and dbus-glib that xfce4-notifyd has been ported to gdbus Signed-off-by: Kai Kang --- .../xfce4-notifyd-get-var-abs-path.patch | 41 +++ ...otifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} | 12 +++--- 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} (66%) diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch new file mode 100644 index 0..719267fd1 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +Native pkg_config only return basename of the variable queried. Invoke `which` +to get the absolute path. + +Upstream-Status: Inappropriate [oe specific] I think this patch could be submitted upstream unless its regressing something in normal build. it is enhancing the search for a tool The value of GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` is absolute path '/usr/bin/gdbus-codegen' on build host such as ubuntu. But for oe, it is just the basename 'gdbus-codegen'. Regards, Kai + +Signed-off-by: Kai Kang +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f49e2b..a589147 100644 +--- a/configure.ac b/configure.ac +@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) + if test x"$GDBUS_CODEGEN" = x""; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` + fi +-if test -x "$GDBUS_CODEGEN"; then ++if test -x "$(which $GDBUS_CODEGEN)"; then + AC_MSG_RESULT([$GDBUS_CODEGEN]) + else + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run +@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) + if test x"$GLIB_COMPILE_RESOURCES" = x""; then + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + fi +-if test -x "$GLIB_COMPILE_RESOURCES"; then ++if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then + AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) + else + AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run +@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) + if test x"$GLIB_GENMARSHAL" = x""; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + fi +-if test -x "$GLIB_GENMARSHAL"; then ++if test -x "$(which $GLIB_GENMARSHAL)"; then + AC_MSG_RESULT([$GLIB_GENMARSHAL]) + else + AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb similarity index 66% rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb index 608660811..7dbd90c18 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd; +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start; LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + DEPENDS = " \ -dbus \ -dbus-glib \ +glib-2.0-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -14,7 +14,9 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" + +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications -- 2.17.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#102002): https://lists.openembedded.org/g/openembedded-devel/message/102002 Mute This Topic: https://lists.openembedded.org/mt/98121602/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] syslog-ng: not deliver syslog-ng-update-virtualenv
From: Kai Kang syslog-ng-update-virtualenv causes install conflict when multilib enabled: Error: Transaction test error: file /usr/bin/syslog-ng-update-virtualenv conflicts between attempted installs of lib32-syslog-ng-4.0.1-r0.core2_32 and syslog-ng-4.0.1-r0.core2_64 Since python support is disabled, not deliver it. Signed-off-by: Kai Kang --- meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb index 4521593ed..650c7bd5f 100644 --- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb +++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.0.1.bb @@ -85,6 +85,10 @@ do_install:append() { # Remove /var/run as it is created on startup rm -rf ${D}${localstatedir}/run +# it causes install conflict when multilib enabled +# since python support is disabled, not deliver it +rm -f ${D}${bindir}/syslog-ng-update-virtualenv + # support for systemd if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -m 644 ${WORKDIR}/syslog-ng.conf.systemd ${D}${sysconfdir}/${BPN}/${BPN}.conf -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101982): https://lists.openembedded.org/g/openembedded-devel/message/101982 Mute This Topic: https://lists.openembedded.org/mt/98122082/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 3/4] xfce4-terminal: 1.0.0 -> 1.0.4
From: Kai Kang Signed-off-by: Kai Kang --- .../{xfce4-terminal_1.0.0.bb => xfce4-terminal_1.0.4.bb}| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-apps/xfce4-terminal/{xfce4-terminal_1.0.0.bb => xfce4-terminal_1.0.4.bb} (80%) diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb similarity index 80% rename from meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb rename to meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb index 85b0812ed..edb0c614e 100644 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.0.bb +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb @@ -10,6 +10,6 @@ FILES:${PN} += " \ ${datadir}/gnome-control-center \ " -SRC_URI[sha256sum] = "593b6a7bd9b18851e51854e075990109b7896a22713b5dd8b913b23f21db6576" +SRC_URI[sha256sum] = "78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4" RRECOMMENDS:${PN} += "vte-prompt" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101980): https://lists.openembedded.org/g/openembedded-devel/message/101980 Mute This Topic: https://lists.openembedded.org/mt/98121603/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 1/4] xfce4-notifyd: 0.6.3 -> 0.8.2
From: Kai Kang Update xfce4-notifyd from 0.6.3 to 0.8.2 * update HOMEPAGE that goodies.xfce.org has been decommissioned * the content of license file has been updated but license not changed * patch for configure.ac to get the absolute path of pkg-config variables * drop dependencies dbus and dbus-glib that xfce4-notifyd has been ported to gdbus Signed-off-by: Kai Kang --- .../xfce4-notifyd-get-var-abs-path.patch | 41 +++ ...otifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} | 12 +++--- 2 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.6.3.bb => xfce4-notifyd_0.8.2.bb} (66%) diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch new file mode 100644 index 0..719267fd1 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +Native pkg_config only return basename of the variable queried. Invoke `which` +to get the absolute path. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Kai Kang +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f49e2b..a589147 100644 +--- a/configure.ac b/configure.ac +@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) + if test x"$GDBUS_CODEGEN" = x""; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` + fi +-if test -x "$GDBUS_CODEGEN"; then ++if test -x "$(which $GDBUS_CODEGEN)"; then + AC_MSG_RESULT([$GDBUS_CODEGEN]) + else + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run +@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) + if test x"$GLIB_COMPILE_RESOURCES" = x""; then + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + fi +-if test -x "$GLIB_COMPILE_RESOURCES"; then ++if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then + AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) + else + AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run +@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) + if test x"$GLIB_GENMARSHAL" = x""; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + fi +-if test -x "$GLIB_GENMARSHAL"; then ++if test -x "$(which $GLIB_GENMARSHAL)"; then + AC_MSG_RESULT([$GLIB_GENMARSHAL]) + else + AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb similarity index 66% rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb index 608660811..7dbd90c18 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.6.3.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd; +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start; LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + DEPENDS = " \ -dbus \ -dbus-glib \ +glib-2.0-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -14,7 +14,9 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[sha256sum] = "56a9f895aed460042f2abe09bb1a899e29b7c7d5a76ecac63dead3ced990859f" +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" + +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101979): https://lists.openembedded.org/g/openembedded-devel/message/101979 Mute This Topic: https://lists.openembedded.org/mt/98121602/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 2/4] xfce4-taskmanager: 1.5.2 -> 1.5.5
From: Kai Kang The content of the license file has been updated [1]. [1]: https://gitlab.xfce.org/apps/xfce4-taskmanager/-/commit/d47388f7 Signed-off-by: Kai Kang --- .../xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb | 9 - .../xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb | 9 + 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb create mode 100644 meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb deleted file mode 100644 index a3d10cd25..0 --- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" - -SRC_URI[sha256sum] = "bd25143f47a29000b4148874863dffa521b1a37cb01dbc026f423ea3160f9a35" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb new file mode 100644 index 0..802d6af4a --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" + +SRC_URI[sha256sum] = "f64f01ba241a0b8bbf2ed3274e5decc2313c9f8b0e4d160db3ba69b331558ae5" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101978): https://lists.openembedded.org/g/openembedded-devel/message/101978 Mute This Topic: https://lists.openembedded.org/mt/98121601/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 4/4] xfce4-screenshooter: 1.9.10 -> 1.10.3
From: Kai Kang Update xfce4-screenshooter from 1.9.10 to 1.10.3 * update HOMEPAGE that goodies.xfce.org has been decommissioning * content of license file has been updated Signed-off-by: Kai Kang --- ...creenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-apps/xfce4-screenshooter/{xfce4-screenshooter_1.9.10.bb => xfce4-screenshooter_1.10.3.bb} (66%) diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb similarity index 66% rename from meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb rename to meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb index bb44ec782..10427dab3 100644 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.10.bb +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb @@ -1,13 +1,13 @@ SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter; +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start; SECTION = "x11/application" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" inherit xfce-app perlnative -SRC_URI[sha256sum] = "04b4178527f5b98cfe76ae427e95581067edf262a530639d332f6db9a68292d7" +SRC_URI[sha256sum] = "a454159847becfeca274a5b58c0e5817d4a260a29345a37bbc3b4ff46f8f3818" do_compile:prepend() { mkdir -p lib -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#101981): https://lists.openembedded.org/g/openembedded-devel/message/101981 Mute This Topic: https://lists.openembedded.org/mt/98121607/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] crda: remove recipe
From: Kai Kang CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45 ("cfg80211: support loading regulatory database as firmware file") added support to use the kernel's firmware request API which looks for the firmware on /lib/firmware. Because of this CRDA is legacy software for older kernels, remove the recipe. It could change regulatory domains with iw and wpa_supplicant. Refs 1. https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/tree/README#n8 2. https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA Signed-off-by: Kai Kang --- meta-networking/conf/layer.conf | 1 - ...-Make-alpha2-to-be-3-characters-long.patch | 31 - ...-Makefile-respect-LDFLAGS-for-libreg.patch | 33 -- .../0001-reglib-Remove-unused-variables.patch | 59 -- .../crda/crda/crda-4.14-python-3.patch| 110 -- ...o-not-run-ldconfig-if-destdir-is-set.patch | 30 - .../crda/fix-issues-when-USE_OPENSSL-1.patch | 58 - ...-linking-of-libraries-used-by-reglib.patch | 57 - ...e-target-word-size-instead-of-host-s.patch | 34 -- .../recipes-connectivity/crda/crda_4.15.bb| 39 --- 10 files changed, 452 deletions(-) delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_4.15.bb diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf index c643e889c..5716eb3f2 100644 --- a/meta-networking/conf/layer.conf +++ b/meta-networking/conf/layer.conf @@ -22,7 +22,6 @@ LICENSE_PATH += "${LAYERDIR}/licenses" SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ wireguard-tools->wireguard-module \ - wireless-regdb->crda \ " BBFILES_DYNAMIC += " \ meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \ diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch deleted file mode 100644 index f1d2cbc5a..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Feb 2022 09:18:30 -0800 -Subject: [PATCH] Make alpha2 to be 3 characters long - -Fixes buffer overflow -reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] - alpha2, - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj - reglib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reglib.c b/reglib.c -index e00e9b8..8565a0b 100644 a/reglib.c -+++ b/reglib.c -@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) - static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) - { - char dfs_region_alpha[9]; -- char alpha2[2]; -+ char alpha2[3]; - int hits; - - memset(rd, 0, sizeof(*rd)); --- -2.35.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch deleted file mode 100644 index d61ea8069..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= -Date: Wed, 24 Aug 2016
Re: [oe] [meta-networking][PATCH] crda: remove recipe
On 1/20/23 00:46, Khem Raj wrote: On Thu, Jan 19, 2023 at 3:34 AM Randy MacLeod wrote: Add Theo, who changed crda earlier this year: And this patch also needs rebasing on top of master or master-next I am sorry that I've sent patch to update crda to 4.15. But without more thinking, I suppose the recipes should be removed since we have 5.15 kernel already. Please drop the previous recipe update patch. Thanks, Kai https://lists.openembedded.org/g/openembedded-devel/message/97671 Does anyone really still need crda? ../Randy On 2023-01-19 03:37, kai.k...@windriver.com wrote: From: Kai Kang CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45 ("cfg80211: support loading regulatory database as firmware file") added support to use the kernel's firmware request API which looks for the firmware on /lib/firmware. Because of this CRDA is legacy software for older kernels, remove the recipe. It could change regulatory domains with iw and wpa_supplicant. Refs 1. https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/tree/README#n8 2. https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA Signed-off-by: Kai Kang --- ...-Make-alpha2-to-be-3-characters-long.patch | 31 -- ...-Makefile-respect-LDFLAGS-for-libreg.patch | 29 - .../0001-reglib-Remove-unused-variables.patch | 59 -- .../crda/crda/crda-4.14-python-3.patch| 101 -- ...o-not-run-ldconfig-if-destdir-is-set.patch | 21 .../crda/fix-gcc-6-unused-variables.patch | 11 -- .../crda/fix-issues-when-USE_OPENSSL-1.patch | 58 -- ...-linking-of-libraries-used-by-reglib.patch | 57 -- .../recipes-connectivity/crda/crda/make.patch | 25 - ...e-target-word-size-instead-of-host-s.patch | 34 -- .../recipes-connectivity/crda/crda_3.18.bb| 40 --- 11 files changed, 466 deletions(-) delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch deleted file mode 100644 index f1d2cbc5a..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Feb 2022 09:18:30 -0800 -Subject: [PATCH] Make alpha2 to be 3 characters long - -Fixes buffer overflow -reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] - alpha2, - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj - reglib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reglib.c b/reglib.c -index e00e9b8..8565a0b 100644 a/reglib.c -+++ b/reglib.c -@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) - static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) - { - char dfs_region_alpha[9]; --char alpha2[2]; -+char alpha2[3]; - int hits; - - memset(rd, 0, sizeof(*rd)); --- -2.35.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/m
[oe] [meta-gnome][PATCH] libnma: 1.10.4 -> 1.10.6
From: Kai Kang === libnma-1.10.6 Overview of changes since libnma-1.10.4 === * Fix the path and translation domains of GSchema files. * Removed strings that don't match our conscious language standards from the translation files. * Added autoptr support. * Fix translations of country and territory names in the mobile broadband dialog. * Honor explicitly set APN if provider was not present in the mobile broadband dialog. * Make sure Kosovar operators are ordered properly in the mobile broadband dialog. Signed-off-by: Kai Kang --- .../libnma/{libnma_1.10.4.bb => libnma_1.10.6.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-gnome/recipes-connectivity/libnma/{libnma_1.10.4.bb => libnma_1.10.6.bb} (92%) diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb similarity index 92% rename from meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb rename to meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb index 6adb7ec29..bff9a3360 100644 --- a/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb +++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.6.bb @@ -10,7 +10,7 @@ inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "79e730dda19f9b34886f4064aa170f1a2326b08329d655d80b67e906c7f78b7c" +SRC_URI[archive.sha256sum] = "53a6fb2b190ad37c5986caed3e98bede7c3c602399ee4f93c8fc054303d76dab" PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info" PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100659): https://lists.openembedded.org/g/openembedded-devel/message/100659 Mute This Topic: https://lists.openembedded.org/mt/96378895/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-networking][PATCH] crda: remove recipe
On 1/19/23 16:37, Kai Kang wrote: From: Kai Kang CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45 ("cfg80211: support loading regulatory database as firmware file") added support to use the kernel's firmware request API which looks for the firmware on /lib/firmware. Because of this CRDA is legacy software for older kernels, remove the recipe. add "Theodore A. Roth " in loop. Regards, Kai It could change regulatory domains with iw and wpa_supplicant. Refs 1. https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/tree/README#n8 2. https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA Signed-off-by: Kai Kang --- ...-Make-alpha2-to-be-3-characters-long.patch | 31 -- ...-Makefile-respect-LDFLAGS-for-libreg.patch | 29 - .../0001-reglib-Remove-unused-variables.patch | 59 -- .../crda/crda/crda-4.14-python-3.patch| 101 -- ...o-not-run-ldconfig-if-destdir-is-set.patch | 21 .../crda/fix-gcc-6-unused-variables.patch | 11 -- .../crda/fix-issues-when-USE_OPENSSL-1.patch | 58 -- ...-linking-of-libraries-used-by-reglib.patch | 57 -- .../recipes-connectivity/crda/crda/make.patch | 25 - ...e-target-word-size-instead-of-host-s.patch | 34 -- .../recipes-connectivity/crda/crda_3.18.bb| 40 --- 11 files changed, 466 deletions(-) delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch deleted file mode 100644 index f1d2cbc5a..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Feb 2022 09:18:30 -0800 -Subject: [PATCH] Make alpha2 to be 3 characters long - -Fixes buffer overflow -reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] - alpha2, - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj - reglib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reglib.c b/reglib.c -index e00e9b8..8565a0b 100644 a/reglib.c -+++ b/reglib.c -@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) - static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) - { - char dfs_region_alpha[9]; -- char alpha2[2]; -+ char alpha2[3]; - int hits; - - memset(rd, 0, sizeof(*rd)); --- -2.35.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch deleted file mode 100644 index 16800d506..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= -Date: Wed, 24 Aug 2016 10:58:45 +0200 -Subject: [PATCH] Makefile: respect LDFLAGS for libre
[oe] [meta-networking][PATCH] crda: remove recipe
From: Kai Kang CRDA is no longer needed as of kernel v4.15 since commit 007f6c5e6eb45 ("cfg80211: support loading regulatory database as firmware file") added support to use the kernel's firmware request API which looks for the firmware on /lib/firmware. Because of this CRDA is legacy software for older kernels, remove the recipe. It could change regulatory domains with iw and wpa_supplicant. Refs 1. https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/tree/README#n8 2. https://wireless.wiki.kernel.org/en/developers/Regulatory/CRDA Signed-off-by: Kai Kang --- ...-Make-alpha2-to-be-3-characters-long.patch | 31 -- ...-Makefile-respect-LDFLAGS-for-libreg.patch | 29 - .../0001-reglib-Remove-unused-variables.patch | 59 -- .../crda/crda/crda-4.14-python-3.patch| 101 -- ...o-not-run-ldconfig-if-destdir-is-set.patch | 21 .../crda/fix-gcc-6-unused-variables.patch | 11 -- .../crda/fix-issues-when-USE_OPENSSL-1.patch | 58 -- ...-linking-of-libraries-used-by-reglib.patch | 57 -- .../recipes-connectivity/crda/crda/make.patch | 25 - ...e-target-word-size-instead-of-host-s.patch | 34 -- .../recipes-connectivity/crda/crda_3.18.bb| 40 --- 11 files changed, 466 deletions(-) delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-reglib-Remove-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-issues-when-USE_OPENSSL-1.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/use-target-word-size-instead-of-host-s.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda_3.18.bb diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch deleted file mode 100644 index f1d2cbc5a..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Make-alpha2-to-be-3-characters-long.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 078e962d345fd0536fe7ba797485ee1a4159c032 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 4 Feb 2022 09:18:30 -0800 -Subject: [PATCH] Make alpha2 to be 3 characters long - -Fixes buffer overflow -reglib.c:969:9: error: 'sscanf' may overflow; destination buffer in argument 3 has size 2, but the corresponding specifier may require size 3 [-Werror,-Wfortify-source] - alpha2, - ^ -Upstream-Status: Pending -Signed-off-by: Khem Raj - reglib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/reglib.c b/reglib.c -index e00e9b8..8565a0b 100644 a/reglib.c -+++ b/reglib.c -@@ -958,7 +958,7 @@ reglib_parse_rules(FILE *fp, struct ieee80211_regdomain *trd) - static int reglib_parse_country_dfs(char *line, struct ieee80211_regdomain *rd) - { - char dfs_region_alpha[9]; -- char alpha2[2]; -+ char alpha2[3]; - int hits; - - memset(rd, 0, sizeof(*rd)); --- -2.35.1 - diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch deleted file mode 100644 index 16800d506..0 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1e1a78b7b4fa1662b4447aa19c15b1e839b7e9db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20M=C3=BCller-Klieser?= -Date: Wed, 24 Aug 2016 10:58:45 +0200 -Subject: [PATCH] Makefile: respect LDFLAGS for libreg -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Müll
[oe] [meta-networking][PATCH] crda: 3.18 -> 4.15
From: Kai Kang Update crda from 3.18 to 4.15: * use git repo in SRC_URI that no tar archive found for recent releases * drop fix-gcc-6-unused-variables.patch and make.patch * rebase patches Signed-off-by: Kai Kang --- ...-Makefile-respect-LDFLAGS-for-libreg.patch | 12 ++--- .../crda/crda/crda-4.14-python-3.patch| 11 +++- ...o-not-run-ldconfig-if-destdir-is-set.patch | 13 -- .../crda/fix-gcc-6-unused-variables.patch | 11 ...-linking-of-libraries-used-by-reglib.patch | 8 +++--- .../recipes-connectivity/crda/crda/make.patch | 25 --- .../crda/{crda_3.18.bb => crda_4.15.bb} | 9 +++ 7 files changed, 37 insertions(+), 52 deletions(-) delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/fix-gcc-6-unused-variables.patch delete mode 100644 meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/make.patch rename meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/{crda_3.18.bb => crda_4.15.bb} (80%) diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch index 16800d506..d61ea8069 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/0001-Makefile-respect-LDFLAGS-for-libreg.patch @@ -7,20 +7,24 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Müller-Klieser + +Rebase for crda 4.15. + +Signed-off-by: Kai Kang --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 2879896..1650db8 100644 +index 528a14e..31f1b5e 100644 --- a/Makefile +++ b/Makefile @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(LIBREG): regdb.h reglib.h reglib.c + $(LIBREG): reglib.c regdb.h reglib.h $(NQ) ' CC ' $@ -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLDLIBS) -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LDFLAGS) $(LIBREGLDLIBS) +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLDLIBS) ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LDFLAGS) $(LIBREGLDLIBS) install-libreg-headers: $(NQ) ' INSTALL libreg-headers' diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch index 9125d0ab9..6c209dc37 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/crda-4.14-python-3.patch @@ -3,6 +3,15 @@ https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c50acec16bc7c33d6dc122c007 Signed-off-by: Khem Raj +Rebase for crda 4.15. + +Signed-off-by: Kai Kang + + utils/key2pub.py | 28 +++- + 1 file changed, 15 insertions(+), 13 deletions(-) + +diff --git a/utils/key2pub.py b/utils/key2pub.py +index 22fda55..2a4980b 100755 --- a/utils/key2pub.py +++ b/utils/key2pub.py @@ -1,22 +1,22 @@ @@ -77,7 +86,7 @@ Signed-off-by: Khem Raj idx = 0 @@ -118,7 +118,7 @@ struct key_params { - static const struct key_params keys[] __attribute__((unused))= { + static const struct key_params __attribute__ ((unused)) keys[] = { ''') -for n in xrange(n + 1): +for n in range(n + 1): diff --git a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch index 3ef35ee54..b5bce40a9 100644 --- a/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch +++ b/meta-networking/dynamic-layers/meta-python/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch @@ -7,12 +7,21 @@ Upstream-Status: Backport [http://www.spinics.net/lists/linux-wireless/msg126028 Signed-off-by: Ben Hutchings Signed-off-by: Joe MacDonald +Rebase patch for crda 4.15. + +Signed-off-by: Kai Kang + + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 6ca26f3..528a14e 100644 --- a/Makefile +++ b/Makefile -@@ -132,7 +132,9 @@ install-libreg: +@@ -127,7 +127,9 @@ install-libreg: $(NQ) ' INSTALL libreg' $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/
[oe] [meta-oe][PATCH] mozjs: fix compile error for arm
From: Kai Kang Backport patch from firefox bugzilla to fix compile error for qemuarm with some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': | /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: error: 'asm' operand has impossible constraints | 240 | asm volatile ( | | ^~~ Ref: * https://bugzilla.mozilla.org/show_bug.cgi?id=1761665 Signed-off-by: Kai Kang --- .../0001-add-arm-to-list-of-mozinline.patch | 25 +++ .../mozjs/mozjs-102_102.5.0.bb| 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch new file mode 100644 index 0..02f5e5c7e --- /dev/null +++ b/meta-oe/recipes-extended/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch @@ -0,0 +1,25 @@ +Backport patch from firefox bugzilla to fix compile error for qemuarm with +some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': + +| /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: + error: 'asm' operand has impossible constraints +| 240 | asm volatile ( +| | ^~~ + +Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] + +Signed-off-by: Kai Kang + +diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +index d8a38a0..65f91ab 100644 +--- a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py +@@ -856,7 +856,7 @@ def generate_atomics_header(c_out): + + # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. + # See bug 1756347. +-if is_gcc and cpu_arch == "x86": ++if is_gcc and cpu_arch in ("x86", "arm"): + contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") + else: + contents = contents.replace("INLINE_ATTR", "inline") diff --git a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb index d38ae10b8..5e884b6f6 100644 --- a/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb +++ b/meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://0001-rewrite-cargo-host-linker-in-python3.patch \ file://py-3.11.patch \ file://musl-disable-stackwalk.patch \ + file://0001-add-arm-to-list-of-mozinline.patch \ " SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100564): https://lists.openembedded.org/g/openembedded-devel/message/100564 Mute This Topic: https://lists.openembedded.org/mt/96249130/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-oe][PATCH] xorg-lib: set XORG_EXT for recipes
From: Kai Kang It sets default value of XORG_EXT with 'tar.xz' in xorg-lib-common.inc, so set XORG_EXT with previous default value 'tar.bz2' to make recipes work, including libxaw, libxkbui, libxpresent and liblbxutil. Signed-off-by: Kai Kang --- meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb | 2 ++ meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb | 5 +++-- meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb| 2 ++ meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb | 2 ++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb index 58b4f31b1..ce064903b 100644 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb @@ -7,6 +7,8 @@ DEPENDS += " xorgproto zlib" PE = "1" PR = "r11" +XORG_EXT = "tar.bz2" + SRC_URI += "file://mkg3states-1.1.patch \ file://0001-lbx_zlib-Mark-declration-with-extern.patch \ " diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb index 08d9b232e..4a909848a 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" PE = "1" +XORG_PN = "libXaw" +XORG_EXT = "tar.bz2" + SRC_URI[md5sum] = "c1ce21c296bbf3da3e30cf651649563e" SRC_URI[sha256sum] = "76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e" @@ -23,5 +26,3 @@ FILES:libxaw8 = "${libdir}/libXaw8.so.8*" # Avoid dependency on libxaw as it is not build RDEPENDS:${PN}-dev = "" - -XORG_PN = "libXaw" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb index 103da1f08..e7c9b64e8 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb @@ -6,5 +6,7 @@ DEPENDS += "virtual/libx11 libxt libxkbfile" PE = "1" PR = "r10" +XORG_EXT = "tar.bz2" + SRC_URI[md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1" SRC_URI[sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb b/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb index 2a59a80e4..3b15153b6 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb @@ -4,6 +4,8 @@ DEPENDS += "xorgproto libxfixes libxrandr" LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" +XORG_EXT = "tar.bz2" + SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/libXpresent-${PV}.tar.xz; SRC_URI[sha256sum] = "b964df9e5a066daa5e08d2dc82692c57ca27d00b8cc257e8e960c9f1cf26231b" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100299): https://lists.openembedded.org/g/openembedded-devel/message/100299 Mute This Topic: https://lists.openembedded.org/mt/95936052/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 5/5] thunar-shares-plugin: Bump GLib minimum required to 2.26
From: Kai Kang Backport patch to bump glib minimum required version to 2.26 for thunar-shares-plugin. Signed-off-by: Kai Kang --- ...d-Bump-GLib-minimum-required-to-2.26.patch | 34 +++ .../shares/thunar-shares-plugin_0.3.1.bb | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 meta-xfce/recipes-thunar-plugins/shares/files/0001-build-Bump-GLib-minimum-required-to-2.26.patch diff --git a/meta-xfce/recipes-thunar-plugins/shares/files/0001-build-Bump-GLib-minimum-required-to-2.26.patch b/meta-xfce/recipes-thunar-plugins/shares/files/0001-build-Bump-GLib-minimum-required-to-2.26.patch new file mode 100644 index 0..1cd24572f --- /dev/null +++ b/meta-xfce/recipes-thunar-plugins/shares/files/0001-build-Bump-GLib-minimum-required-to-2.26.patch @@ -0,0 +1,34 @@ +Upstream-Status: Backport [https://gitlab.xfce.org/thunar-plugins/thunar-shares-plugin/-/commit/e4bce21a] + +Signed-off-by: Kai Kang + +From e4bce21a1bd744ccfde84de4669ac30aa1d72135 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= +Date: Fri, 2 Dec 2022 20:18:46 +0100 +Subject: [PATCH] build: Bump GLib minimum required to 2.26 + +This is the minimum required to build since xfce4-dev-tools >= 4.17.1 +set GLIB_VERSION_MAX_ALLOWED to the GLib version found in +configure.ac.in. + +MR: !3 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index a458785..bc6d24c 100644 +--- a/configure.ac b/configure.ac +@@ -61,7 +61,7 @@ dnl --- + dnl Packages checks + dnl --- + XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.22.0]) +-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0]) ++XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.26.0]) + XDT_CHECK_PACKAGE([THUNARX], [thunarx-3], [1.0.1]) + + dnl --- +-- +2.34.1 + diff --git a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb index fb7589637..d981fe14a 100644 --- a/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb +++ b/meta-xfce/recipes-thunar-plugins/shares/thunar-shares-plugin_0.3.1.bb @@ -7,7 +7,7 @@ inherit thunar-plugin features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "pam" -SRC_URI[md5sum] = "0884855d60cf1031b9013b6f5b125372" +SRC_URI += "file://0001-build-Bump-GLib-minimum-required-to-2.26.patch" SRC_URI[sha256sum] = "dc1d8c7caa727e76d033d4653dc0742613f57a1711d0050900659c90a84452a0" RDEPENDS:${PN} += "samba-server" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100290): https://lists.openembedded.org/g/openembedded-devel/message/100290 Mute This Topic: https://lists.openembedded.org/mt/95904465/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 3/5] xfce4-wavelan-plugin: 0.6.2 -> 0.6.3
From: Kai Kang Signed-off-by: Kai Kang --- ...e4-wavelan-plugin_0.6.2.bb => xfce4-wavelan-plugin_0.6.3.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-panel-plugins/wavelan/{xfce4-wavelan-plugin_0.6.2.bb => xfce4-wavelan-plugin_0.6.3.bb} (76%) diff --git a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb similarity index 76% rename from meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb rename to meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb index c52b35d02..530f52425 100644 --- a/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.2.bb +++ b/meta-xfce/recipes-panel-plugins/wavelan/xfce4-wavelan-plugin_0.6.3.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e1e5872df9c5cf1a23f16493d9104920" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d" +SRC_URI[sha256sum] = "61c0c2f56cb70872d403b770dd76349df9ff24c0dbe905ee1b4f913c34d8f72b" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100289): https://lists.openembedded.org/g/openembedded-devel/message/100289 Mute This Topic: https://lists.openembedded.org/mt/95904464/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 4/5] xfce4-sensors-plugin: 1.4.3 -> 1.4.4
From: Kai Kang Update xfce4-sensors-plugin from 1.4.3 to 1.4.4 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- ...ensors-plugin_1.4.3.bb => xfce4-sensors-plugin_1.4.4.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-panel-plugins/sensors/{xfce4-sensors-plugin_1.4.3.bb => xfce4-sensors-plugin_1.4.4.bb} (81%) diff --git a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb similarity index 81% rename from meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb rename to meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb index 13933b6cd..69996d2a3 100644 --- a/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.3.bb +++ b/meta-xfce/recipes-panel-plugins/sensors/xfce4-sensors-plugin_1.4.4.bb @@ -1,12 +1,12 @@ SUMMARY = "Sensors plugin for the Xfce Panel" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin; -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b94789bed9aec03b9656a9cc5398c706" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9" SRC_URI += "file://0001-Do-not-check-for-sys-class-power_supply-we-are-cross.patch" +SRC_URI[sha256sum] = "6c1605a738e5df40e084d08ac93f962cd445093396de1e9bfadc7ab4588c36b6" EXTRA_OECONF = " \ --disable-procacpi \ -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100291): https://lists.openembedded.org/g/openembedded-devel/message/100291 Mute This Topic: https://lists.openembedded.org/mt/95904466/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 2/5] xfce4-cpugraph-plugin: 1.2.6 -> 1.2.7
From: Kai Kang Update xfce4-cpugraph-plugin from 1.2.6 to 1.2.7 * correct license with LGPL-2.0-or-later Signed-off-by: Kai Kang --- ...pugraph-plugin_1.2.6.bb => xfce4-cpugraph-plugin_1.2.7.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-panel-plugins/cpugraph/{xfce4-cpugraph-plugin_1.2.6.bb => xfce4-cpugraph-plugin_1.2.7.bb} (68%) diff --git a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.7.bb similarity index 68% rename from meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb rename to meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.7.bb index a9ac08989..e23188d30 100644 --- a/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.6.bb +++ b/meta-xfce/recipes-panel-plugins/cpugraph/xfce4-cpugraph-plugin_1.2.7.bb @@ -1,8 +1,8 @@ SUMMARY = "Panel plugin with graphical representation of the cpu frequency" HOMEPAGE = "https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin; -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=415654f59d8fa70fe4eac2c3f86c8f5e" inherit xfce-panel-plugin -SRC_URI[sha256sum] = "773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99" +SRC_URI[sha256sum] = "68a651e278ed7186964e455b69b15da77f8d56257e5c3d6adf783b3ee9337405" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100288): https://lists.openembedded.org/g/openembedded-devel/message/100288 Mute This Topic: https://lists.openembedded.org/mt/95904463/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 1/5] xfce4-cpufreq-plugin: 1.2.7 -> 1.2.8
From: Kai Kang Update xfce4-cpufreq-plugin from 1.2.7 to 1.2.8 * correct license with LGPL-2.0-or-later * inherit perlnative Signed-off-by: Kai Kang --- ...pufreq-plugin_1.2.7.bb => xfce4-cpufreq-plugin_1.2.8.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-panel-plugins/cpufreq/{xfce4-cpufreq-plugin_1.2.7.bb => xfce4-cpufreq-plugin_1.2.8.bb} (58%) diff --git a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb similarity index 58% rename from meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb rename to meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb index c98fe4a5c..8ddf48d6e 100644 --- a/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.7.bb +++ b/meta-xfce/recipes-panel-plugins/cpufreq/xfce4-cpufreq-plugin_1.2.8.bb @@ -1,8 +1,8 @@ SUMMARY = "Panel plugin to display frequency of all cpus" HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin; -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1f6f1c0be32491a0c8d2915607a28f36" -inherit xfce-panel-plugin +inherit xfce-panel-plugin perlnative -SRC_URI[sha256sum] = "5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c" +SRC_URI[sha256sum] = "07e458d9f4725e572001fb7eb66b9e931792311146e0f75ad5d87b9ae19573e9" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100287): https://lists.openembedded.org/g/openembedded-devel/message/100287 Mute This Topic: https://lists.openembedded.org/mt/95904461/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH v2 1/2] libxfce4ui: 4.16.1 -> 4.18.0
From: Kai Kang Update libxfce4ui from 4.16.1 to 4.18.0. And update license which should be LGPL-2.0-or-later according to https://gitlab.xfce.org/xfce/libxfce4ui/-/commit/797b7a6b and https://gitlab.xfce.org/xfce/libxfce4ui/-/blob/master/COPYING#L457 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Signed-off-by: Kai Kang --- ...4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | 10 +- .../{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%) diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch index 616142761..53ba87374 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui/0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch @@ -11,15 +11,15 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - libxfce4kbd-private/xfce4-keyboard-shortcuts.xml |4 - 1 files changed, 4 insertions(+), 0 deletions(-) + libxfce4kbd-private/xfce4-keyboard-shortcuts.xml | 4 + 1 file changed, 4 insertions(+) diff --git a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -index 723a10d..e6502f3 100644 +index 32901e3..8189c4c 100644 --- a/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml +++ b/libxfce4kbd-private/xfce4-keyboard-shortcuts.xml -@@ -75,4 +75,8 @@ - +@@ -96,4 +96,8 @@ + + diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb similarity index 84% rename from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb rename to meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb index 692c79f3c..7ff9d1b12 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf" inherit xfce gtk-doc gobject-introspection features_check @@ -12,7 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # TODO: Check if 0001-... can go SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" -SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" +SRC_URI[sha256sum] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" EXTRA_OECONF += "--disable-vala" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100285): https://lists.openembedded.org/g/openembedded-devel/message/100285 Mute This Topic: https://lists.openembedded.org/mt/95902784/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH v2 0/2] Fixups for libxfce4ui and thunar-volman
From: Kai Kang v2: * fix fuzzy patch issue for libxfce4ui * fix configure error for thunar-volman Other update for xfce4 core recipes are as same as v1. Kai Kang (2): libxfce4ui: 4.16.1 -> 4.18.0 thunar-volman: 4.16.0 -> 4.18.0 ...4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch | 10 +- .../{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} | 6 +++--- ...thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} | 8 3 files changed, 12 insertions(+), 12 deletions(-) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%) rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (56%) -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100286): https://lists.openembedded.org/g/openembedded-devel/message/100286 Mute This Topic: https://lists.openembedded.org/mt/95902786/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH v2 2/2] thunar-volman: 4.16.0 -> 4.18.0
From: Kai Kang Update thunar-volman from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later * inherit perlnative to fix error: | checking for XML::Parser... configure: error: | XML::Parser perl module is required for intltool Signed-off-by: Kai Kang --- .../{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (56%) diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb similarity index 56% rename from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb rename to meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb index 4b72d3a79..a136ba054 100644 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb @@ -1,14 +1,14 @@ SUMMARY = "Automatic management of removable drives and media for thunar" SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "exo libnotify libgudev" -inherit xfce features_check +inherit xfce features_check perlnative REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" +SRC_URI[sha256sum] = "93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65" PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100284): https://lists.openembedded.org/g/openembedded-devel/message/100284 Mute This Topic: https://lists.openembedded.org/mt/95902783/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-xfce][PATCH 00/16] Update core xfce components to 4.18.0
On 12/26/22 01:56, Khem Raj wrote: Thanks for that patches. They fail to build see xfce related recipe failures here. https://errors.yoctoproject.org/Errors/Build/157414/ It seems all are qemumips related. I'll check them. Kai On Sat, Dec 24, 2022 at 1:34 PM Kai Kang wrote: From: Kai Kang Kai Kang (16): xfce4-dev-tools: 4.16.0 -> 4.18.0 libxfce4util: 4.16.0 -> 4.18.0 libxfce4ui: 4.16.1 -> 4.18.0 exo: 4.16.4 -> 4.18.0 garcon: 4.16.1 -> 4.18.0 xfce4-panel: 4.16.3 -> 4.18.0 thunar: 4.16.9 -> 4.18.0 thunar-volman: 4.16.0 -> 4.18.0 tumbler: 4.16.0 -> 4.18.0 xfconf: 4.16.0 -> 4.18.0 xfce4-appfinder: 4.16.1 -> 4.18.0 xfce4-power-manager: 4.16.0 -> 4.18.0 xfce4-session: 4.16.0 -> 4.18.0 xfce4-settings: 4.16.5 -> 4.18.0 xfdesktop: 4.16.0 -> 4.18.0 xfwm4: 4.16.1 -> 4.18.0 .../recipes-xfce/exo/exo/configure.patch | 57 .../exo/exo/exo-no-tests-0.8.patch| 9 +- .../reduce-build-to-exo-csource-only.patch| 90 --- .../exo/{exo_4.16.4.bb => exo_4.18.0.bb} | 5 +- .../{garcon_4.16.1.bb => garcon_4.18.0.bb}| 2 +- ...xfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} | 6 +- .../libxfce4util/libxfce4util_4.16.0.bb | 9 -- .../libxfce4util/libxfce4util_4.18.0.bb | 9 ++ ...lman_4.16.0.bb => thunar-volman_4.18.0.bb} | 6 +- .../{thunar_4.16.9.bb => thunar_4.18.0.bb}| 8 +- .../{tumbler_4.16.0.bb => tumbler_4.18.0.bb} | 9 +- ...er_4.16.1.bb => xfce4-appfinder_4.18.0.bb} | 6 +- ...ls_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} | 14 +-- ...t-display-desktop-icon-when-no-windo.patch | 15 ++-- ...-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} | 4 +- 16.0.bb => xfce4-power-manager_4.18.0.bb} | 2 +- ...sion_4.16.0.bb => xfce4-session_4.18.0.bb} | 10 +-- ...ngs_4.16.5.bb => xfce4-settings_4.18.0.bb} | 6 +- .../{xfconf_4.16.0.bb => xfconf_4.18.0.bb}| 4 +- ...fdesktop_4.16.0.bb => xfdesktop_4.18.0.bb} | 4 +- .../{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} | 4 +- 21 files changed, 69 insertions(+), 210 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo/configure.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch rename meta-xfce/recipes-xfce/exo/{exo_4.16.4.bb => exo_4.18.0.bb} (84%) rename meta-xfce/recipes-xfce/garcon/{garcon_4.16.1.bb => garcon_4.18.0.bb} (89%) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%) delete mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (63%) rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.9.bb => thunar_4.18.0.bb} (77%) rename meta-xfce/recipes-xfce/tumbler/{tumbler_4.16.0.bb => tumbler_4.18.0.bb} (80%) rename meta-xfce/recipes-xfce/xfce4-appfinder/{xfce4-appfinder_4.16.1.bb => xfce4-appfinder_4.18.0.bb} (54%) rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} (78%) rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} (93%) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_4.16.0.bb => xfce4-power-manager_4.18.0.bb} (93%) rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.16.0.bb => xfce4-session_4.18.0.bb} (82%) rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.5.bb => xfce4-settings_4.18.0.bb} (85%) rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.16.0.bb => xfconf_4.18.0.bb} (85%) rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.16.0.bb => xfdesktop_4.18.0.bb} (77%) rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} (90%) -- 2.17.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100231): https://lists.openembedded.org/g/openembedded-devel/message/100231 Mute This Topic: https://lists.openembedded.org/mt/95868220/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 16/16] xfwm4: 4.16.1 -> 4.18.0
From: Kai Kang Update xfwm4 from 4.16.1 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- .../recipes-xfce/xfwm4/{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} (90%) diff --git a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb similarity index 90% rename from meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb rename to meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb index a32bad47e..839f1c870 100644 --- a/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.16.1.bb +++ b/meta-xfce/recipes-xfce/xfwm4/xfwm4_4.18.0.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Xfce4 Window Manager" SECTION = "x11/wm" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" DEPENDS = "virtual/libx11 libxfce4ui libwnck3 libxinerama" @@ -8,7 +8,7 @@ inherit xfce update-alternatives features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c" +SRC_URI[sha256sum] = "92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f" PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'epoxy', '', d)} \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100224): https://lists.openembedded.org/g/openembedded-devel/message/100224 Mute This Topic: https://lists.openembedded.org/mt/95868240/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 11/16] xfce4-appfinder: 4.16.1 -> 4.18.0
From: Kai Kang Update xfce4-appfinder from 4.16.1 to 4.18.0. * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- ...{xfce4-appfinder_4.16.1.bb => xfce4-appfinder_4.18.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-xfce/xfce4-appfinder/{xfce4-appfinder_4.16.1.bb => xfce4-appfinder_4.18.0.bb} (54%) diff --git a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.18.0.bb similarity index 54% rename from meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb rename to meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.18.0.bb index 18d9fedfc..06dc0a200 100644 --- a/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.16.1.bb +++ b/meta-xfce/recipes-xfce/xfce4-appfinder/xfce4-appfinder_4.18.0.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Xfce4 Application Finder" SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0 gtk+3 libxfce4util libxfce4ui garcon xfconf" inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec" +SRC_URI[sha256sum] = "962a98d7b327d2073ed4cd0f78bce7945ed51b97d52fd60196e8b02ef819c18c" FILES:${PN} += "${datadir}/metainfo" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100219): https://lists.openembedded.org/g/openembedded-devel/message/100219 Mute This Topic: https://lists.openembedded.org/mt/95868235/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 15/16] xfdesktop: 4.16.0 -> 4.18.0
From: Kai Kang Update xfdesktop from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- .../xfdesktop/{xfdesktop_4.16.0.bb => xfdesktop_4.18.0.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.16.0.bb => xfdesktop_4.18.0.bb} (77%) diff --git a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.0.bb similarity index 77% rename from meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb rename to meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.0.bb index 4a1ece8be..6895b7912 100644 --- a/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfdesktop/xfdesktop_4.18.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Desktop Manager" SECTION = "x11/base" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libxfce4ui libwnck thunar garcon exo" @@ -8,7 +8,7 @@ inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "934ba5affecff21e62d9fac1dd50c50cd94b3a807fefa5f5bff59f3d6f155bae" +SRC_URI[sha256sum] = "661783e7e6605459926d80bca46d25ce2197c221456457a863ea9d0252120d14" PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100222): https://lists.openembedded.org/g/openembedded-devel/message/100222 Mute This Topic: https://lists.openembedded.org/mt/95868238/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 14/16] xfce4-settings: 4.16.5 -> 4.18.0
From: Kai Kang Update xfce4-settings from 4.16.5 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- .../{xfce4-settings_4.16.5.bb => xfce4-settings_4.18.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.5.bb => xfce4-settings_4.18.0.bb} (85%) diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb similarity index 85% rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb index 4a4e9f188..0692970f7 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.18.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Xfce4 settings" SECTION = "x11/wm" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "exo garcon libxi virtual/libx11 xrandr libxcursor libxklavier upower" inherit xfce features_check mime-xdg @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e" +SRC_URI[sha256sum] = "ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100223): https://lists.openembedded.org/g/openembedded-devel/message/100223 Mute This Topic: https://lists.openembedded.org/mt/95868239/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 13/16] xfce4-session: 4.16.0 -> 4.18.0
From: Kai Kang Update xfce4-session from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- ...xfce4-session_4.16.0.bb => xfce4-session_4.18.0.bb} | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.16.0.bb => xfce4-session_4.18.0.bb} (82%) diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb similarity index 82% rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb rename to meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb index e6613b8ee..25d30cebe 100644 --- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.18.0.bb @@ -1,20 +1,20 @@ SUMMARY = "xfce4-session is a session manager for Xfce 4 Desktop Environment" SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libwnck3 libsm libxfce4ui virtual/libx11" inherit xfce update-alternatives features_check +SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" +SRC_URI[sha256sum] = "38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f" + REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)}" PACKAGECONFIG[polkit] = "--enable-polkit, --disable-polkit, polkit" -SRC_URI += "file://0001-configure.in-hard-code-path-to-iceauth.patch" -SRC_URI[sha256sum] = "22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7" - ALTERNATIVE:${PN} = "x-session-manager" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session" ALTERNATIVE_PRIORITY_${PN} = "150" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100221): https://lists.openembedded.org/g/openembedded-devel/message/100221 Mute This Topic: https://lists.openembedded.org/mt/95868237/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 12/16] xfce4-power-manager: 4.16.0 -> 4.18.0
From: Kai Kang Signed-off-by: Kai Kang --- ...e4-power-manager_4.16.0.bb => xfce4-power-manager_4.18.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_4.16.0.bb => xfce4-power-manager_4.18.0.bb} (93%) diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb similarity index 93% rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb index 34de7a708..f61c9cd6a 100644 --- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_4.18.0.bb @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "libnotify libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver" -SRC_URI[sha256sum] = "eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3" +SRC_URI[sha256sum] = "2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a" EXTRA_OECONF = " \ --enable-network-manager \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100220): https://lists.openembedded.org/g/openembedded-devel/message/100220 Mute This Topic: https://lists.openembedded.org/mt/95868236/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 10/16] xfconf: 4.16.0 -> 4.18.0
From: Kai Kang Update xfconf from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- .../xfconf/{xfconf_4.16.0.bb => xfconf_4.18.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.16.0.bb => xfconf_4.18.0.bb} (85%) diff --git a/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb similarity index 85% rename from meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb rename to meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb index be742192b..f5c598b8d 100644 --- a/meta-xfce/recipes-xfce/xfconf/xfconf_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfconf/xfconf_4.18.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce configuration daemon and utilities" SECTION = "x11/wm" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "libxfce4util perl intltool-native xfce4-dev-tools-native" @@ -8,7 +8,7 @@ inherit xfce gtk-doc gobject-introspection bash-completion vala EXTRA_OECONF += "PERL=${STAGING_DIR_TARGET}/usr/bin/perl" -SRC_URI[sha256sum] = "652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425" +SRC_URI[sha256sum] = "2e8c50160bf800a807aea094fc9dad81f9f361f42db56607508ed5b4855d2906" FILES:${PN} += "${libdir}/xfce4/xfconf/xfconfd \ ${libdir}/gio/modules/libxfconfgsettingsbackend.so \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100218): https://lists.openembedded.org/g/openembedded-devel/message/100218 Mute This Topic: https://lists.openembedded.org/mt/95868234/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 09/16] tumbler: 4.16.0 -> 4.18.0
From: Kai Kang Update tumbler from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later * add dependency libxfce4util * inherit systemd Signed-off-by: Kai Kang --- .../tumbler/{tumbler_4.16.0.bb => tumbler_4.18.0.bb} | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) rename meta-xfce/recipes-xfce/tumbler/{tumbler_4.16.0.bb => tumbler_4.18.0.bb} (80%) diff --git a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb similarity index 80% rename from meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb rename to meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb index 6a583ade7..0472d4885 100644 --- a/meta-xfce/recipes-xfce/tumbler/tumbler_4.16.0.bb +++ b/meta-xfce/recipes-xfce/tumbler/tumbler_4.18.0.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Thumbnail service implementing the thumbnail management D-Bus specification" SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf" +DEPENDS = "freetype gdk-pixbuf poppler curl xfce4-dev-tools-native libxml2 libgsf libxfce4util" -inherit xfce gtk-doc +inherit xfce gtk-doc systemd -SRC_URI[sha256sum] = "9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66" +SRC_URI[sha256sum] = "4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00" INSANE_SKIP:${PN} = "dev-so" @@ -23,6 +23,7 @@ FILES:${PN} += "${datadir}/dbus-1/services \ ${libdir}/tumbler-1/tumblerd \ ${libdir}/tumbler-1/plugins/*.so \ ${libdir}/tumbler-1/plugins/cache/*.so \ +${systemd_user_unitdir}/tumblerd.service \ " FILES:${PN}-dev += "${libdir}/tumbler-1/plugins/*.la \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100217): https://lists.openembedded.org/g/openembedded-devel/message/100217 Mute This Topic: https://lists.openembedded.org/mt/95868233/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 08/16] thunar-volman: 4.16.0 -> 4.18.0
From: Kai Kang Update thunar-volman from 4.16.0 to 4.18.0 * update license with GPL-2.0-or-later Signed-off-by: Kai Kang --- .../{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb}| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (63%) diff --git a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb similarity index 63% rename from meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb rename to meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb index 4b72d3a79..f6c6b44b8 100644 --- a/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.16.0.bb +++ b/meta-xfce/recipes-xfce/thunar-volman/thunar-volman_4.18.0.bb @@ -1,14 +1,14 @@ SUMMARY = "Automatic management of removable drives and media for thunar" SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "exo libnotify libgudev" inherit xfce features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d" +SRC_URI[sha256sum] = "93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65" PACKAGECONFIG ??= "notify" PACKAGECONFIG[notify] = "--enable-notifications,--disable-notifications,libnotify" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100216): https://lists.openembedded.org/g/openembedded-devel/message/100216 Mute This Topic: https://lists.openembedded.org/mt/95868232/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 07/16] thunar: 4.16.9 -> 4.18.0
From: Kai Kang Update thunar from 4.16.9 to 4.18.0. * update license which should be GPL-2.0-or-later * update package config pcre Signed-off-by: Kai Kang --- .../thunar/{thunar_4.16.9.bb => thunar_4.18.0.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.9.bb => thunar_4.18.0.bb} (77%) diff --git a/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb b/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb similarity index 77% rename from meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb rename to meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb index d3702c83c..3c05dacc6 100644 --- a/meta-xfce/recipes-xfce/thunar/thunar_4.16.9.bb +++ b/meta-xfce/recipes-xfce/thunar/thunar_4.18.0.bb @@ -1,7 +1,7 @@ SUMMARY = "File manager for the Xfce Desktop Environment" SECTION = "x11" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libxml-parser-perl-native exo gdk-pixbuf libxfce4ui libnotify xfce4-panel udev" inherit xfce gobject-introspection features_check mime-xdg perlnative @@ -10,10 +10,10 @@ inherit xfce gobject-introspection features_check mime-xdg perlnative # cairo would at least needed to be built with xlib. ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "520bf318eef8bc792db38ae4af343b648f87d4b8d66f5b5d6f092e15264ee5af" +SRC_URI[sha256sum] = "d1f4b080c97b9e390eff199c7562fb20f031686f8d5ee5207e953bfc2feb" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[pcre] = "--enable-pcre,--disable-pcre,libpcre" +PACKAGECONFIG[pcre] = "--enable-pcre2,--disable-pcre2,libpcre2" PACKAGECONFIG[x11] = ",,libsm startup-notification" FILES:${PN} += " \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100215): https://lists.openembedded.org/g/openembedded-devel/message/100215 Mute This Topic: https://lists.openembedded.org/mt/95868229/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 05/16] garcon: 4.16.1 -> 4.18.0
From: Kai Kang Signed-off-by: Kai Kang --- .../recipes-xfce/garcon/{garcon_4.16.1.bb => garcon_4.18.0.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/garcon/{garcon_4.16.1.bb => garcon_4.18.0.bb} (89%) diff --git a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb b/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb similarity index 89% rename from meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb rename to meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb index 14f0c4a64..6a1ee7b7f 100644 --- a/meta-xfce/recipes-xfce/garcon/garcon_4.16.1.bb +++ b/meta-xfce/recipes-xfce/garcon/garcon_4.18.0.bb @@ -11,7 +11,7 @@ inherit xfce gtk-doc gobject-introspection features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" SRC_URI += "file://0001-xfce-applications.menu-don-t-bloat-settings-menu-by-.patch" -SRC_URI[sha256sum] = "84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d" +SRC_URI[sha256sum] = "54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14" EXTRA_OECONF = "--disable-gtk-doc" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100213): https://lists.openembedded.org/g/openembedded-devel/message/100213 Mute This Topic: https://lists.openembedded.org/mt/95868225/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 06/16] xfce4-panel: 4.16.3 -> 4.18.0
From: Kai Kang Update xfce4-panel 4.16.3 to 4.18.0 * update license which should be GPL-2.0-or-later * rebase 0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch Signed-off-by: Kai Kang --- ...o-not-display-desktop-icon-when-no-windo.patch | 15 +-- ...fce4-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} (93%) diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 1adb14552..10c456f45 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller + +Rebase for xfce4 4.18.0. + +Signed-off-by: Kai Kang --- plugins/windowmenu/windowmenu.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index f47e993e..061d6544 100644 +index ba245a3..f8fdee8 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -250,7 +250,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); @@ -30,16 +34,14 @@ index f47e993e..061d6544 100644 gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_widget_show (plugin->icon); } -@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, +@@ -680,19 +680,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, /* skip 'fake' windows */ type = wnck_window_get_window_type (window); if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) -goto show_desktop_icon; +goto show_no_icon; - /* get the window icon and set the tooltip */ - gtk_widget_set_tooltip_text (GTK_WIDGET (icon), -@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + window_menu_plugin_set_icon (plugin, window); } else { @@ -47,6 +49,7 @@ index f47e993e..061d6544 100644 + show_no_icon: /* desktop is shown right now */ + icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin)); - gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); + gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb similarity index 93% rename from meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb rename to meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb index 46d26159a..5dcd69d35 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.16.3.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.0.bb @@ -1,6 +1,6 @@ SUMMARY = "Xfce4 Panel" SECTION = "x11" -LICENSE = "GPL-2.0-only" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" @@ -10,11 +10,11 @@ inherit xfce gtk-doc gobject-introspection features_check mime-xdg # cairo would at least needed to be built with xlib. ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[sha256sum] = "5934eaed8a76da52c29b734ccd79600255420333dd6ebd8fd9f066379af1e092" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " +SRC_URI[sha256sum] = "be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710" EXTRA_OECONF += "--disable-vala" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100214): https://lists.openembedded.org/g/openembedded-devel/message/100214 Mute This Topic: https://lists.openembedded.org/mt/95868226/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 03/16] libxfce4ui: 4.16.1 -> 4.18.0
From: Kai Kang Update libxfce4ui from 4.16.1 to 4.18.0. And update license which should be LGPL-2.0-or-later according to https://gitlab.xfce.org/xfce/libxfce4ui/-/commit/797b7a6b and https://gitlab.xfce.org/xfce/libxfce4ui/-/blob/master/COPYING#L457 This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Signed-off-by: Kai Kang --- .../{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%) diff --git a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb similarity index 84% rename from meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb rename to meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb index 692c79f3c..7ff9d1b12 100644 --- a/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.16.1.bb +++ b/meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.18.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Xfce4 Widget library and X Window System interaction" SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" DEPENDS = "intltool-native perl-native gtk+3 libxfce4util xfce4-dev-tools xfconf" inherit xfce gtk-doc gobject-introspection features_check @@ -12,7 +12,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" # TODO: Check if 0001-... can go SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch" -SRC_URI[sha256sum] = "d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6" +SRC_URI[sha256sum] = "532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b" EXTRA_OECONF += "--with-vendor-info=${DISTRO}" EXTRA_OECONF += "--disable-vala" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100211): https://lists.openembedded.org/g/openembedded-devel/message/100211 Mute This Topic: https://lists.openembedded.org/mt/95868222/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 04/16] exo: 4.16.4 -> 4.18.0
From: Kai Kang Update exo from 4.16.4 to 4.18.0 * update license which should be GPL-2.0-or-later * remove configure.patch that it supports cross compil now * remove obsolete patch reduce-build-to-exo-csource-only.patch Signed-off-by: Kai Kang --- .../recipes-xfce/exo/exo/configure.patch | 57 .../exo/exo/exo-no-tests-0.8.patch| 9 +- .../reduce-build-to-exo-csource-only.patch| 90 --- .../exo/{exo_4.16.4.bb => exo_4.18.0.bb} | 5 +- 4 files changed, 8 insertions(+), 153 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo/configure.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch rename meta-xfce/recipes-xfce/exo/{exo_4.16.4.bb => exo_4.18.0.bb} (84%) diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch deleted file mode 100644 index 89cc1f387..0 --- a/meta-xfce/recipes-xfce/exo/exo/configure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001 -From: Andreas Mueller -Date: Mon, 1 Aug 2011 17:16:29 +0200 - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller - - configure.ac | 34 ++ - 1 file changed, 18 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0de5ceb..3f92d1b 100644 a/configure.ac -+++ b/configure.ac -@@ -143,22 +143,24 @@ AC_FUNC_MMAP() - dnl *** - dnl *** Check for strftime() extensions *** - dnl *** --AC_TRY_RUN([ -- #include -- #include -- int -- main (int argc, char **argv) -- { --struct tm tm; --char buffer[16]; --tm.tm_year = 81; --if (strftime (buffer, 16, "%EY", ) == 4 && strcmp (buffer, "1981") == 0) -- return 0; --return 1; -- } --], [ -- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) --]) -+dnl g... this doesn't work for cross compiling, define it for OE -+AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) -+dnl AC_TRY_RUN([ -+dnl #include -+dnl #include -+dnl int -+dnl main (int argc, char **argv) -+dnl { -+dnl struct tm tm; -+dnl char buffer[16]; -+dnl tm.tm_year = 81; -+dnl if (strftime (buffer, 16, "%EY", ) == 4 && strcmp (buffer, "1981") == 0) -+dnl return 0; -+dnl return 1; -+dnl } -+dnl ], [ -+dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.]) -+dnl ]) - - dnl ** - dnl *** Check for i18n support *** diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch index 348e147cf..c5e7a097f 100644 --- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch +++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch @@ -10,17 +10,20 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller +Rebase for xfce4 4.18.0. + +Signed-off-by: Kai Kang --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 226e79d..62ad18d 100644 +index 513ac36..c395272 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -9,8 +9,7 @@ SUBDIRS = \ +@@ -6,8 +6,7 @@ SUBDIRS = \ + exo-open\ docs\ - icons \ pixmaps \ - po \ - tests diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch deleted file mode 100644 index 8c950299f..0 --- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch +++ /dev/null @@ -1,90 +0,0 @@ -From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 4 May 2019 14:50:11 +0200 -Subject: [PATCH] reduce build to exo-csource only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -exo-csource creates c-header files from glade resource output files. When -building xfce-packages from git instead of tarball this exo-csource-native is -required. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller - - Makefile.am | 10 +- - configure.ac | 20 - 2 files changed,
[oe] [meta-xfce][PATCH 01/16] xfce4-dev-tools: 4.16.0 -> 4.18.0
From: Kai Kang Update LICENSE which is GPL-2.0-or-later, see https://gitlab.xfce.org/xfce/xfce4-dev-tools/-/blob/master/COPYING#L298 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. Signed-off-by: Kai Kang --- ...v-tools_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} (78%) diff --git a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb similarity index 78% rename from meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb rename to meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb index 586a77efc..6ca18b8b3 100644 --- a/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.16.0.bb +++ b/meta-xfce/recipes-xfce/xfce4-dev-tools/xfce4-dev-tools_4.18.0.bb @@ -1,21 +1,19 @@ SUMMARY = "Xfce4 development tools" HOMEPAGE = "http://www.xfce.org; SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0" DEPENDS:append:class-target = " ${BPN}-native" -inherit autotools pkgconfig - -BBCLASSEXTEND = "native" - SRC_URI = "http://archive.xfce.org/src/xfce/${BPN}/${@'${PV}'[0:4]}/${BPN}-${PV}.tar.bz2 \ file://0001-m4macros-Check-for-a-function-provided-by-libX11-in-.patch \ " SRC_URI:append:class-target = " file://0001-Run-native-xdt-csource-on-tests.patch" -SRC_URI[sha256sum] = "f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04" +SRC_URI[sha256sum] = "eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37" + +inherit autotools pkgconfig do_install:append() { install -d ${D}${datadir}/aclocal @@ -25,3 +23,5 @@ do_install:append() { FILES:${PN} += "${datadir}/xfce4/dev-tools/m4macros/*.m4" RDEPENDS:${PN} = "bash" + +BBCLASSEXTEND = "native" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100208): https://lists.openembedded.org/g/openembedded-devel/message/100208 Mute This Topic: https://lists.openembedded.org/mt/95868219/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 00/16] Update core xfce components to 4.18.0
From: Kai Kang Kai Kang (16): xfce4-dev-tools: 4.16.0 -> 4.18.0 libxfce4util: 4.16.0 -> 4.18.0 libxfce4ui: 4.16.1 -> 4.18.0 exo: 4.16.4 -> 4.18.0 garcon: 4.16.1 -> 4.18.0 xfce4-panel: 4.16.3 -> 4.18.0 thunar: 4.16.9 -> 4.18.0 thunar-volman: 4.16.0 -> 4.18.0 tumbler: 4.16.0 -> 4.18.0 xfconf: 4.16.0 -> 4.18.0 xfce4-appfinder: 4.16.1 -> 4.18.0 xfce4-power-manager: 4.16.0 -> 4.18.0 xfce4-session: 4.16.0 -> 4.18.0 xfce4-settings: 4.16.5 -> 4.18.0 xfdesktop: 4.16.0 -> 4.18.0 xfwm4: 4.16.1 -> 4.18.0 .../recipes-xfce/exo/exo/configure.patch | 57 .../exo/exo/exo-no-tests-0.8.patch| 9 +- .../reduce-build-to-exo-csource-only.patch| 90 --- .../exo/{exo_4.16.4.bb => exo_4.18.0.bb} | 5 +- .../{garcon_4.16.1.bb => garcon_4.18.0.bb}| 2 +- ...xfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} | 6 +- .../libxfce4util/libxfce4util_4.16.0.bb | 9 -- .../libxfce4util/libxfce4util_4.18.0.bb | 9 ++ ...lman_4.16.0.bb => thunar-volman_4.18.0.bb} | 6 +- .../{thunar_4.16.9.bb => thunar_4.18.0.bb}| 8 +- .../{tumbler_4.16.0.bb => tumbler_4.18.0.bb} | 9 +- ...er_4.16.1.bb => xfce4-appfinder_4.18.0.bb} | 6 +- ...ls_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} | 14 +-- ...t-display-desktop-icon-when-no-windo.patch | 15 ++-- ...-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} | 4 +- 16.0.bb => xfce4-power-manager_4.18.0.bb} | 2 +- ...sion_4.16.0.bb => xfce4-session_4.18.0.bb} | 10 +-- ...ngs_4.16.5.bb => xfce4-settings_4.18.0.bb} | 6 +- .../{xfconf_4.16.0.bb => xfconf_4.18.0.bb}| 4 +- ...fdesktop_4.16.0.bb => xfdesktop_4.18.0.bb} | 4 +- .../{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} | 4 +- 21 files changed, 69 insertions(+), 210 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/exo/exo/configure.patch delete mode 100644 meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch rename meta-xfce/recipes-xfce/exo/{exo_4.16.4.bb => exo_4.18.0.bb} (84%) rename meta-xfce/recipes-xfce/garcon/{garcon_4.16.1.bb => garcon_4.18.0.bb} (89%) rename meta-xfce/recipes-xfce/libxfce4ui/{libxfce4ui_4.16.1.bb => libxfce4ui_4.18.0.bb} (84%) delete mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb rename meta-xfce/recipes-xfce/thunar-volman/{thunar-volman_4.16.0.bb => thunar-volman_4.18.0.bb} (63%) rename meta-xfce/recipes-xfce/thunar/{thunar_4.16.9.bb => thunar_4.18.0.bb} (77%) rename meta-xfce/recipes-xfce/tumbler/{tumbler_4.16.0.bb => tumbler_4.18.0.bb} (80%) rename meta-xfce/recipes-xfce/xfce4-appfinder/{xfce4-appfinder_4.16.1.bb => xfce4-appfinder_4.18.0.bb} (54%) rename meta-xfce/recipes-xfce/xfce4-dev-tools/{xfce4-dev-tools_4.16.0.bb => xfce4-dev-tools_4.18.0.bb} (78%) rename meta-xfce/recipes-xfce/xfce4-panel/{xfce4-panel_4.16.3.bb => xfce4-panel_4.18.0.bb} (93%) rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_4.16.0.bb => xfce4-power-manager_4.18.0.bb} (93%) rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.16.0.bb => xfce4-session_4.18.0.bb} (82%) rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.5.bb => xfce4-settings_4.18.0.bb} (85%) rename meta-xfce/recipes-xfce/xfconf/{xfconf_4.16.0.bb => xfconf_4.18.0.bb} (85%) rename meta-xfce/recipes-xfce/xfdesktop/{xfdesktop_4.16.0.bb => xfdesktop_4.18.0.bb} (77%) rename meta-xfce/recipes-xfce/xfwm4/{xfwm4_4.16.1.bb => xfwm4_4.18.0.bb} (90%) -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100209): https://lists.openembedded.org/g/openembedded-devel/message/100209 Mute This Topic: https://lists.openembedded.org/mt/95868220/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-xfce][PATCH 02/16] libxfce4util: 4.16.0 -> 4.18.0
From: Kai Kang Correct the license which should be LGPL-2.0-or-later. And the license file has been updated by: https://gitlab.xfce.org/xfce/libxfce4util/-/commit/0c334855 It has such descriptions: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version Signed-off-by: Kai Kang --- .../recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb | 9 - .../recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb | 9 + 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb create mode 100644 meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb deleted file mode 100644 index 6824ac67e..0 --- a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.16.0.bb +++ /dev/null @@ -1,9 +0,0 @@ -SUMMARY = "Basic utility library for Xfce4" -SECTION = "x11/libs" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475" -DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" - -inherit xfce gtk-doc gobject-introspection vala - -SRC_URI[sha256sum] = "60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83" diff --git a/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb new file mode 100644 index 0..3dd1f55b4 --- /dev/null +++ b/meta-xfce/recipes-xfce/libxfce4util/libxfce4util_4.18.0.bb @@ -0,0 +1,9 @@ +SUMMARY = "Basic utility library for Xfce4" +SECTION = "x11/libs" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4cf66a4984120007c9881cc871cf49db" +DEPENDS = "intltool-native xfce4-dev-tools-native glib-2.0" + +inherit xfce gtk-doc gobject-introspection vala + +SRC_URI[sha256sum] = "1157ca717fd3dd1da7724a6432a4fb24af9cd922f738e971fd1fd36dfaeac3c9" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100210): https://lists.openembedded.org/g/openembedded-devel/message/100210 Mute This Topic: https://lists.openembedded.org/mt/95868221/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [kirkstone][meta-xfce][PATCH] xfce4-settings: 4.16.2 -> 4.16.5
From: Kai Kang Update xfce4-settings to latest 4.16.x. It fixes CVE-2022-45062 in xfce4-settings 4.16.4. CVE: CVE-2022-45062 4.16.5 (2022-11-12) == - mime-settings: Properly quote command parameters - Revert "Escape characters which do not belong into an URI/URL (Issue 4.16.4 (2022-11-07) == - Escape characters which do not belong into an URI/URL (Issue #390) - Prefer full command when basic command is env (Fixes #358) - Translation Updates: Japanese, Portuguese, Russian 4.16.3 == - xfsettingsd: Fix recursive lock in libX11 (Fixes #369) - build: Fix intltool lock file problem during make distcheck - Translation Updates: Armenian (Armenia), Belarusian, Catalan, English (Canada), English (United Kingdom), Estonian, Galician, Greek, Indonesian, Kazakh, Korean, Lithuanian, Malay, Occitan (post 1500), Polish, Romanian, Swedish Signed-off-by: Kai Kang --- .../{xfce4-settings_4.16.2.bb => xfce4-settings_4.16.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta-xfce/recipes-xfce/xfce4-settings/{xfce4-settings_4.16.2.bb => xfce4-settings_4.16.5.bb} (93%) diff --git a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb similarity index 93% rename from meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb rename to meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb index aa4265f7b..4a4e9f188 100644 --- a/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.2.bb +++ b/meta-xfce/recipes-xfce/xfce4-settings/xfce4-settings_4.16.5.bb @@ -9,7 +9,7 @@ inherit xfce features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0001-xsettings.xml-Set-default-themes.patch" -SRC_URI[sha256sum] = "4dd7cb420860535e687f673c0b5c0274e0d2fb67181281d4b85be9197da03d7e" +SRC_URI[sha256sum] = "7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e" EXTRA_OECONF += "--enable-maintainer-mode --disable-debug" -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100207): https://lists.openembedded.org/g/openembedded-devel/message/100207 Mute This Topic: https://lists.openembedded.org/mt/95864252/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH v2 0/1] python3-wxgtk4: replace deprecated inspect.getargspec
On 12/5/22 01:33, Khem Raj wrote: On Sat, Dec 3, 2022 at 10:44 PM wrote: From: Kai Kang Hi Khem, The backported patch is dos format which ends with CRLF. But the other part of this commit still end with LF. It seems fail to call `git apply` directly. So I pushed to github: https://github.com/kkang-wr/meta-openembedded/commit/b9a114e5c992afd6619512cd78098ef9d9072170 It should be fetched and cherry-picked Please create a PR for ease against https://github.com/openembedded/meta-openembedded as a special case. OK. Thanks. Kai Thanks, Kai Kang (1): python3-wxgtk4: replace deprecated inspect.getargspec ...eplace-deprecated-inspect.getargspec.patch | 65 +++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb| 2 + 2 files changed, 67 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch -- 2.17.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99948): https://lists.openembedded.org/g/openembedded-devel/message/99948 Mute This Topic: https://lists.openembedded.org/mt/95442606/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-networking][PATCH] postfix: fix multilib conflict of sample-main.cf
From: Kai Kang It fails to install postfix and lib32-postfix at same time: | Error: Transaction test error: | file /etc/postfix/sample-main.cf conflicts between attempted installs of lib32-postfix-cfg-3.7.3-r0.i586 and postfix-cfg-3.7.3-r0.core2_64 Rename sample-main.cf with ${MLPREFIX}. Signed-off-by: Kai Kang --- meta-networking/recipes-daemons/postfix/postfix.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-daemons/postfix/postfix.inc b/meta-networking/recipes-daemons/postfix/postfix.inc index 8a4428c50..5133caaa4 100644 --- a/meta-networking/recipes-daemons/postfix/postfix.inc +++ b/meta-networking/recipes-daemons/postfix/postfix.inc @@ -115,7 +115,7 @@ do_install () { 'data_directory=${localstatedir}/lib/postfix' \ -non-interactive rm -rf ${D}${localstatedir}/spool/postfix -mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/sample-main.cf +mv ${D}${sysconfdir}/postfix/main.cf ${D}${sysconfdir}/postfix/${MLPREFIX}sample-main.cf install -m 755 ${S}/bin/smtp-sink ${D}/${sbindir}/ install -d ${D}${sysconfdir}/init.d install -m 644 ${WORKDIR}/main.cf ${D}${sysconfdir}/postfix/main.cf -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99946): https://lists.openembedded.org/g/openembedded-devel/message/99946 Mute This Topic: https://lists.openembedded.org/mt/95444091/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH v2 1/1] python3-wxgtk4: replace deprecated inspect.getargspec
From: Kai Kang Backport patch to replace deprecated inspect.getargspec in lib pubsub. And add python3-pip to RDEPENDS which is required by utils wxdemo, wxdocs and wxget provided by python3-wxgtk4. Signed-off-by: Kai Kang --- ...eplace-deprecated-inspect.getargspec.patch | 65 +++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb| 2 + 2 files changed, 67 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch new file mode 100644 index 0..9bec4c5ba --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch @@ -0,0 +1,65 @@ +Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/9986a0d5] + +Signed-off-by: Kai Kang + +From 9986a0d5c24b5d45ddf571d60351f68765a8a9be Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Mon, 8 Aug 2022 22:35:58 -0400 +Subject: [PATCH] pypubsub: Replace deprecated inspect.getargspec + +inspect.getargspec was removed in Python 3.11. This is a backport of: +https://github.com/schollii/pypubsub/commit/089c7a73f85c76a3aa22e4b10c71db1bf65a8637 +--- + wx/lib/pubsub/core/callables.py | 23 +++ + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +index 65eb1ebe..7e798c54 100644 +--- a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +@@ -12,7 +12,7 @@ CallArgsInfo regarding its autoTopicArgName data member. + + """ + +-from inspect import getargspec, ismethod, isfunction ++from inspect import ismethod, isfunction, signature, Parameter + + from .. import py2and3 + +@@ -133,19 +133,26 @@ class CallArgsInfo: + self.autoTopicArgName = None.""" + + #args, firstArgIdx, defaultVals, acceptsAllKwargs +-(allParams, varParamName, varOptParamName, defaultVals) = getargspec(func) +-if defaultVals is None: +-defaultVals = [] +-else: +-defaultVals = list(defaultVals) ++allParams = [] ++defaultVals = [] ++varParamName = None ++varOptParamName = None ++for argName, param in signature(func).parameters.items(): ++if param.default != Parameter.empty: ++defaultVals.append(param.default) ++if param.kind == Parameter.VAR_POSITIONAL: ++varParamName = argName ++elif param.kind == Parameter.VAR_KEYWORD: ++varOptParamName = argName ++else: ++allParams.append(argName) + + self.acceptsAllKwargs = (varOptParamName is not None) + self.acceptsAllUnnamedArgs = (varParamNameis not None) +- + self.allParams = allParams +-del self.allParams[0:firstArgIdx] # does nothing if firstArgIdx == 0 + + self.numRequired = len(self.allParams) - len(defaultVals) ++assert len(self.allParams) >= len(defaultVals) + assert self.numRequired >= 0 + + # if listener wants topic, remove that arg from args/defaultVals +-- +2.34.1 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb index faea43777..df23037fc 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb @@ -13,6 +13,7 @@ PYPI_PACKAGE = "wxPython" SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://not-overwrite-cflags-cxxflags.patch \ +file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ " SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" @@ -29,6 +30,7 @@ RDEPENDS:${PN} = "\ python3-image \ python3-numpy \ python3-pillow \ +python3-pip \ python3-pprint \ python3-pycairo \ python3-six \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99943): https://lists.openembedded.org/g/openembedded-devel/message/99943 Mute This Topic: https://lists.openembedded.org/mt/95442607/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH v2 0/1] python3-wxgtk4: replace deprecated inspect.getargspec
From: Kai Kang Hi Khem, The backported patch is dos format which ends with CRLF. But the other part of this commit still end with LF. It seems fail to call `git apply` directly. So I pushed to github: https://github.com/kkang-wr/meta-openembedded/commit/b9a114e5c992afd6619512cd78098ef9d9072170 It should be fetched and cherry-picked. Thanks, Kai Kang (1): python3-wxgtk4: replace deprecated inspect.getargspec ...eplace-deprecated-inspect.getargspec.patch | 65 +++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb| 2 + 2 files changed, 67 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99942): https://lists.openembedded.org/g/openembedded-devel/message/99942 Mute This Topic: https://lists.openembedded.org/mt/95442606/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [oe] [meta-python][PATCH] python3-wxgtk4: replace deprecated inspect.getargspec
On 11/30/22 06:19, Khem Raj wrote: On Tue, Nov 29, 2022 at 6:51 AM Kai Kang wrote: From: Kai Kang Backport patch to replace deprecated inspect.getargspec in lib pubsub. And add python3-pip to RDEPENDS which is required by utils wxdemo, wxdocs and wxget provided by python3-wxgtk4. Signed-off-by: Kai Kang --- ...eplace-deprecated-inspect.getargspec.patch | 65 +++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb| 2 + 2 files changed, 67 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch new file mode 100644 index 0..4501667f9 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch @@ -0,0 +1,65 @@ +Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/9986a0d5] + +Signed-off-by: Kai Kang + +From 9986a0d5c24b5d45ddf571d60351f68765a8a9be Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Mon, 8 Aug 2022 22:35:58 -0400 +Subject: [PATCH] pypubsub: Replace deprecated inspect.getargspec + +inspect.getargspec was removed in Python 3.11. This is a backport of: +https://github.com/schollii/pypubsub/commit/089c7a73f85c76a3aa22e4b10c71db1bf65a8637 +--- + wx/lib/pubsub/core/callables.py | 23 +++ + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +index 65eb1ebe..7e798c54 100644 +--- a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +@@ -12,7 +12,7 @@ CallArgsInfo regarding its autoTopicArgName data member. + + """ + +-from inspect import getargspec, ismethod, isfunction ++from inspect import ismethod, isfunction, signature, Parameter + + from .. import py2and3 + +@@ -133,19 +133,26 @@ class CallArgsInfo: + self.autoTopicArgName = None.""" + + #args, firstArgIdx, defaultVals, acceptsAllKwargs +-(allParams, varParamName, varOptParamName, defaultVals) = getargspec(func) +-if defaultVals is None: +-defaultVals = [] +-else: +-defaultVals = list(defaultVals) ++allParams = [] ++defaultVals = [] ++varParamName = None ++varOptParamName = None ++for argName, param in signature(func).parameters.items(): ++if param.default != Parameter.empty: ++defaultVals.append(param.default) ++if param.kind == Parameter.VAR_POSITIONAL: ++varParamName = argName ++elif param.kind == Parameter.VAR_KEYWORD: ++varOptParamName = argName ++else: ++allParams.append(argName) + + self.acceptsAllKwargs = (varOptParamName is not None) + self.acceptsAllUnnamedArgs = (varParamNameis not None) +- + self.allParams = allParams +-del self.allParams[0:firstArgIdx] # does nothing if firstArgIdx == 0 + + self.numRequired = len(self.allParams) - len(defaultVals) ++assert len(self.allParams) >= len(defaultVals) + assert self.numRequired >= 0 + + # if listener wants topic, remove that arg from args/defaultVals +-- +2.34.1 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb index faea43777..df23037fc 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb @@ -13,6 +13,7 @@ PYPI_PACKAGE = "wxPython" SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://not-overwrite-cflags-cxxflags.patch \ +file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ " Fails to apply patching file wx/lib/pubsub/core/callables.py Hunk #1 FAILED at 12 (different line endings). Hunk #2 FAILED at 133 (different line endings). 2 out of 2 hunks FAILED -- rejects in file wx/lib/pubsub/core/callables.py Patch 0001-pypubsub-Replace-deprecated-inspect.getargspec.patch does not apply (enforce with -f) Sorry, my fault. v2 will be sent. Kai SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" @@ -29,6 +30,7 @@ RDEPENDS:${PN} = "\ python3-image \ python3-numpy \ python3-pillow \ +python3-pip \ python3-pprint \ python3-pycairo \ python3-six \ -- 2.17.1 -- Kai Kang Wind River Linux -=-=-=-=-=-=-=-=-=-=-=- Links: You rece
[oe] [meta-python][PATCH] python3-wxgtk4: replace deprecated inspect.getargspec
From: Kai Kang Backport patch to replace deprecated inspect.getargspec in lib pubsub. And add python3-pip to RDEPENDS which is required by utils wxdemo, wxdocs and wxget provided by python3-wxgtk4. Signed-off-by: Kai Kang --- ...eplace-deprecated-inspect.getargspec.patch | 65 +++ .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb| 2 + 2 files changed, 67 insertions(+) create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch new file mode 100644 index 0..4501667f9 --- /dev/null +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch @@ -0,0 +1,65 @@ +Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/9986a0d5] + +Signed-off-by: Kai Kang + +From 9986a0d5c24b5d45ddf571d60351f68765a8a9be Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Mon, 8 Aug 2022 22:35:58 -0400 +Subject: [PATCH] pypubsub: Replace deprecated inspect.getargspec + +inspect.getargspec was removed in Python 3.11. This is a backport of: +https://github.com/schollii/pypubsub/commit/089c7a73f85c76a3aa22e4b10c71db1bf65a8637 +--- + wx/lib/pubsub/core/callables.py | 23 +++ + 1 file changed, 15 insertions(+), 8 deletions(-) + +diff --git a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +index 65eb1ebe..7e798c54 100644 +--- a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py +@@ -12,7 +12,7 @@ CallArgsInfo regarding its autoTopicArgName data member. + + """ + +-from inspect import getargspec, ismethod, isfunction ++from inspect import ismethod, isfunction, signature, Parameter + + from .. import py2and3 + +@@ -133,19 +133,26 @@ class CallArgsInfo: + self.autoTopicArgName = None.""" + + #args, firstArgIdx, defaultVals, acceptsAllKwargs +-(allParams, varParamName, varOptParamName, defaultVals) = getargspec(func) +-if defaultVals is None: +-defaultVals = [] +-else: +-defaultVals = list(defaultVals) ++allParams = [] ++defaultVals = [] ++varParamName = None ++varOptParamName = None ++for argName, param in signature(func).parameters.items(): ++if param.default != Parameter.empty: ++defaultVals.append(param.default) ++if param.kind == Parameter.VAR_POSITIONAL: ++varParamName = argName ++elif param.kind == Parameter.VAR_KEYWORD: ++varOptParamName = argName ++else: ++allParams.append(argName) + + self.acceptsAllKwargs = (varOptParamName is not None) + self.acceptsAllUnnamedArgs = (varParamNameis not None) +- + self.allParams = allParams +-del self.allParams[0:firstArgIdx] # does nothing if firstArgIdx == 0 + + self.numRequired = len(self.allParams) - len(defaultVals) ++assert len(self.allParams) >= len(defaultVals) + assert self.numRequired >= 0 + + # if listener wants topic, remove that arg from args/defaultVals +-- +2.34.1 + diff --git a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb index faea43777..df23037fc 100644 --- a/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +++ b/meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb @@ -13,6 +13,7 @@ PYPI_PACKAGE = "wxPython" SRC_URI += "file://add-back-option-build-base.patch \ file://wxgtk-fixup-build-scripts.patch \ file://not-overwrite-cflags-cxxflags.patch \ +file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \ " SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7" @@ -29,6 +30,7 @@ RDEPENDS:${PN} = "\ python3-image \ python3-numpy \ python3-pillow \ +python3-pip \ python3-pprint \ python3-pycairo \ python3-six \ -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99845): https://lists.openembedded.org/g/openembedded-devel/message/99845 Mute This Topic: https://lists.openembedded.org/mt/95335564/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [PATCH] fixup! wxwidgets: 3.1.5 -> 3.2.1
From: Kai Kang The config file name is based on which package config among gtk, qt and no_gui is enabled. Fix it in do_install script. Signed-off-by: Kai Kang --- meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb index 4bb07fda0..7f0d27123 100644 --- a/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb +++ b/meta-oe/recipes-extended/wxwidgets/wxwidgets_3.2.1.bb @@ -103,7 +103,7 @@ do_install:append() { # fix host contamination sed -i -e "s#${STAGING_DIR_NATIVE}##g" \ -e "s#${STAGING_DIR_TARGET}##g" \ - ${D}${libdir}/wx/config/gtk3-unicode-3.2 \ + ${D}${libdir}/wx/config/*-unicode-3.2 \ ${D}${libdir}/cmake/wxWidgets/wxWidgetsTargets.cmake } -- 2.17.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#99823): https://lists.openembedded.org/g/openembedded-devel/message/99823 Mute This Topic: https://lists.openembedded.org/mt/95306543/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[oe] [meta-python][PATCH] python3-m2crypto: fix CVE-2020-25657 and buildpaths qa issue
From: Kai Kang Backport patch to fix CVE-2020-25657 for python3-m2crypto. Adjust indent as well. Remove duplicate 'Upstream-Status:' from avoid-host-contamination.patch. Add swig option '-DOPENSSL_FILE' to fix buildpaths qa issues. WARNING: python3-m2crypto-0.38.0-r0 do_package_qa: QA Issue: File /usr/lib/python3.11/site-packages/M2Crypto/_m2crypto.cpython-311-x86_64-linux-gnu.so in package python3-m2crypto contains reference to TMPDIR [buildpaths] Signed-off-by: Kai Kang --- .../python3-m2crypto/CVE-2020-25657.patch | 176 ++ .../avoid-host-contamination.patch| 2 +- .../python/python3-m2crypto_0.38.0.bb | 11 +- 3 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch b/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch new file mode 100644 index 0..38ecd7a27 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-m2crypto/CVE-2020-25657.patch @@ -0,0 +1,176 @@ +Backport patch to fix CVE-2020-25657. + +Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/84c53958] + +Signed-off-by: Kai Kang + +From 84c53958def0f510e92119fca14d74f94215827a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= +Date: Tue, 28 Jun 2022 21:17:01 +0200 +Subject: [PATCH] Mitigate the Bleichenbacher timing attacks in the RSA + decryption API (CVE-2020-25657) + +Fixes #282 +--- + src/SWIG/_m2crypto_wrap.c | 20 + src/SWIG/_rsa.i | 20 + tests/test_rsa.py | 15 +++ + 3 files changed, 31 insertions(+), 24 deletions(-) + +diff --git a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +index aba9eb6d..a9f30da9 100644 +--- a/src/SWIG/_m2crypto_wrap.c b/src/SWIG/_m2crypto_wrap.c +@@ -7040,9 +7040,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7070,9 +7071,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7097,9 +7099,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -7124,9 +7127,10 @@ PyObject *rsa_private_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); + +diff --git a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +index bc714e01..1377b8be 100644 +--- a/src/SWIG/_rsa.i b/src/SWIG/_rsa.i +@@ -239,9 +239,10 @@ PyObject *rsa_private_encrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_private_encrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -269,9 +270,10 @@ PyObject *rsa_public_decrypt(RSA *rsa, PyObject *from, int padding) { + tlen = RSA_public_decrypt(flen, (unsigned char *)fbuf, + (unsigned char *)tbuf, rsa, padding); + if (tlen == -1) { +-m2_PyErr_Msg(_rsa_err); ++ERR_clear_error(); ++PyErr_Clear(); + PyMem_Free(tbuf); +-return NULL; ++Py_RETURN_NONE; + } + + ret = PyBytes_FromStringAndSize((const char *)tbuf, tlen); +@@ -296,9 +298,10 @@ PyObject *rsa_public_encrypt(RSA *rsa, PyObject *from, int padding
[oe] [PATCH V2] xfce4-embed-plugin: 1.0.0 -> 1.6.0
Upgrade xfce4-embed-plugin from 1.0.0 to 1.6.0 * update md5sum of licese file COPYING which has been updated to to match the one at gnu.org, see https://github.com/xfce-mirror/xfce4-embed-plugin/commit/d20cec5#diff-7116ef0 Signed-off-by: Kai Kang --- .../{xfce4-embed-plugin_1.0.0.bb => xfce4-embed-plugin_1.6.0.bb}| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-xfce/recipes-panel-plugins/embed/{xfce4-embed-plugin_1.0.0.bb => xfce4-embed-plugin_1.6.0.bb} (57%) diff --git a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb similarity index 57% rename from meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb rename to meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb index cab3ea754..387b183f1 100644 --- a/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.0.0.bb +++ b/meta-xfce/recipes-panel-plugins/embed/xfce4-embed-plugin_1.6.0.bb @@ -2,11 +2,11 @@ DESCRIPTION = "A panel plugin that embeds arbitrary windows (or GtkPlug widgets) HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-embed-plugin; SECTION = "x11/application" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" inherit xfce-panel-plugin # DEPENDS += "xfconf xorgproto libxtst" -SRC_URI[md5sum] = "c5b86cbc1c54ee7c1d2e95a4502fed8e" -SRC_URI[sha256sum] = "35d4c6c56dd6468c0e5afe66f657c1526f2d830a577105a51da43657651832e3" +SRC_URI[md5sum] = "6870b116b85e4fa68d1b9ef76bd1d279" +SRC_URI[sha256sum] = "c767df6360e8194b32bc24823dd000975edba0cafe525c23d7854029359ee228" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH 5/5] logcheck: 1.3.18 -> 1.3.19
Upgrade logcheck from 1.3.18 to 1.3.19. * update SRC_URI to replace git repo with tarball that saves some space Signed-off-by: Kai Kang --- .../logcheck/{logcheck_1.3.18.bb => logcheck_1.3.19.bb}| 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) rename meta-perl/recipes-extended/logcheck/{logcheck_1.3.18.bb => logcheck_1.3.19.bb} (92%) diff --git a/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb b/meta-perl/recipes-extended/logcheck/logcheck_1.3.19.bb similarity index 92% rename from meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb rename to meta-perl/recipes-extended/logcheck/logcheck_1.3.19.bb index 6182c17f9..873ac2b10 100644 --- a/meta-perl/recipes-extended/logcheck/logcheck_1.3.18.bb +++ b/meta-perl/recipes-extended/logcheck/logcheck_1.3.19.bb @@ -11,12 +11,11 @@ HOMEPAGE = "http://logcheck.org/; LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=c93c0550bd3173f4504b2cbd8991e50b" -SRC_URI = "git://salsa.debian.org/debian/logcheck.git;protocol=https \ +SRC_URI = "${DEBIAN_MIRROR}/main/l/${BPN}/${BPN}_${PV}.tar.xz \ file://99_logcheck \ " -SRCREV = "0a5865d80fa34c55387a1917a3e6f885bcff7f1d" - -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "7b50d10da6f185228627c55fdd51f624" +SRC_URI[sha256sum] = "06294c092b2115eca3d054c57778718c91dd2e0fd1c46650b7343c2a92672ca9" inherit useradd -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH 4/5] libio-socket-ssl-perl: 2.054 -> 2.508
Signed-off-by: Kai Kang --- ...{libio-socket-ssl-perl_2.054.bb => libio-socket-ssl-perl_2.058.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-perl/recipes-perl/libio/{libio-socket-ssl-perl_2.054.bb => libio-socket-ssl-perl_2.058.bb} (91%) diff --git a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.058.bb similarity index 91% rename from meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb rename to meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.058.bb index ea78bc4e0..0fd5ea9d1 100644 --- a/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.054.bb +++ b/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.058.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "e1b412e28d107c716e7ca637e2b7f8bd" -SRC_URI[sha256sum] = "02ea04e9a336a7d3ca9aa604c0c5b5aaf3efa513cefecfc73cc79ceeb5131e4b" +SRC_URI[md5sum] = "5eb4091dc1e83d769cadbc925c721511" +SRC_URI[sha256sum] = "746cd17c292cfc206b394497a060b0582d0b06a1040e6bb27e6530d56786e40b" S = "${WORKDIR}/IO-Socket-SSL-${PV}" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH 3/5] libnet-ssleay-perl: 1.84 -> 1.85
Signed-off-by: Kai Kang --- .../libnet/{libnet-ssleay-perl_1.84.bb => libnet-ssleay-perl_1.85.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-perl/recipes-perl/libnet/{libnet-ssleay-perl_1.84.bb => libnet-ssleay-perl_1.85.bb} (90%) diff --git a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb similarity index 90% rename from meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb rename to meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb index cfecef9cf..a0bb90e7d 100644 --- a/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.84.bb +++ b/meta-perl/recipes-perl/libnet/libnet-ssleay-perl_1.85.bb @@ -25,8 +25,8 @@ RDEPENDS_${PN} += "\ SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[md5sum] = "cfbe968487149626978f427cc9fb8c77" -SRC_URI[sha256sum] = "823ec3cbb428309d6a9e56f362a9300693ce3215b7fede109adb7be361fff177" +SRC_URI[md5sum] = "d602bdce4e0531c6efc276e3e429ca69" +SRC_URI[sha256sum] = "9d8188b9fb1cae3bd791979c20554925d5e94a138d00414f1a6814549927b0c8" S = "${WORKDIR}/Net-SSLeay-${PV}" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH 2/5] libnet-dns-perl: 1.14 -> 1.17
Upgrade libnet-dns-perl from 1.14 to 1.17. * correct LICENSE which should be MIT Signed-off-by: Kai Kang --- .../libnet/{libnet-dns-perl_1.14.bb => libnet-dns-perl_1.17.bb} | 8 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-perl/recipes-perl/libnet/{libnet-dns-perl_1.14.bb => libnet-dns-perl_1.17.bb} (68%) diff --git a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.17.bb similarity index 68% rename from meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb rename to meta-perl/recipes-perl/libnet/libnet-dns-perl_1.17.bb index efaa7f7b1..79583551f 100644 --- a/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.14.bb +++ b/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.17.bb @@ -1,16 +1,16 @@ DESCRIPTION = "This package contains the DNS.pm module with friends." HOMEPAGE = "http://www.net-dns.org/; SECTION = "libs" -LICENSE = "Artistic-1.0 | GPL-1.0+" +LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://README;md5=92d93d8c5bf22de77578531e283dd219" +LIC_FILES_CHKSUM = "file://README;beginline=252;endline=269;md5=27db37b42cd1a5173a53922d67072bcb" DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz; -SRC_URI[md5sum] = "0da1099c0a3548d36ea9e31d5bb9e122" -SRC_URI[sha256sum] = "83c38a594eeb2c85d66e60047a0f5b403f34bd92a5d13606f02e828d450299fc" +SRC_URI[md5sum] = "28fcbcbf4483a9f23f75be4b9e3e45c8" +SRC_URI[sha256sum] = "9a79fd8fea1a708726c18d193ae4437479206ccb20ffa7f0971371e172e2c2e0" S = "${WORKDIR}/Net-DNS-${PV}" -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-perl][PATCH 1/5] adduser: 3.116 -> 3.117
Upgrade adduser from 3.116 to 3.117. * remove redefine of S Signed-off-by: Kai Kang --- .../recipes-perl/adduser/{adduser_3.116.bb => adduser_3.117.bb} | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta-perl/recipes-perl/adduser/{adduser_3.116.bb => adduser_3.117.bb} (91%) diff --git a/meta-perl/recipes-perl/adduser/adduser_3.116.bb b/meta-perl/recipes-perl/adduser/adduser_3.117.bb similarity index 91% rename from meta-perl/recipes-perl/adduser/adduser_3.116.bb rename to meta-perl/recipes-perl/adduser/adduser_3.117.bb index 363f5b117..e5cefd4c6 100644 --- a/meta-perl/recipes-perl/adduser/adduser_3.116.bb +++ b/meta-perl/recipes-perl/adduser/adduser_3.117.bb @@ -10,13 +10,11 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/a/${BPN}/${BPN}_${PV}.tar.x file://adduser-add-M-option-for-useradd.patch \ " -SRC_URI[md5sum] = "e042a5842b8f24312d6f5a99a1af8f2c" -SRC_URI[sha256sum] = "72d811ad3ba17d2794b14d19acd1d6b57f9dd31d9250d51e786895dee2daeac0" +SRC_URI[md5sum] = "9f36d69585e74c022aa8e22a0337507d" +SRC_URI[sha256sum] = "be01881356e40c4d7dd2ce209fb4a94c0589056ac3ebe7debbbf09a6383c1411" inherit cpan-base update-alternatives -S = "${WORKDIR}/${BPN}" - do_install() { install -d ${D}${sbindir} install -m 0755 ${S}/adduser ${D}${sbindir} -- 2.11.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel