| Message ID | 20251223061043.659-1-liuyd.fnst@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,1/7] flatpak: upgrade 1.17.0 -> 1.17.2 | expand |
On 12/23/25 07:10, Yiding Liu (Fujitsu) via lists.openembedded.org wrote: > 1. Changelog: > https://github.com/flatpak/flatpak/releases/tag/1.17.2 > > 2. Update 0001-flatpak-pc-add-pc_sysrootdir.patch for 1.17.2 > > 3. Remove http_backend related options as they were removed in 1.17.2 > > Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> > --- > .../flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch | 11 +++++++---- > .../flatpak/{flatpak_1.17.0.bb => flatpak_1.17.2.bb} | 7 ++----- > 2 files changed, 9 insertions(+), 9 deletions(-) > rename meta-oe/recipes-extended/flatpak/{flatpak_1.17.0.bb => flatpak_1.17.2.bb} (90%) > > diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch > index 08d5625fa7..6207ae617b 100644 > --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch > +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch > @@ -7,22 +7,25 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > Upstream-Status: Inappropriate [oe-specific] > > +Update for 1.17.2. > +Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> > +--- > meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meson.build b/meson.build > -index 4a0b865e..5f69b1d9 100644 > +index e97b8cef..5c8de55f 100644 > --- a/meson.build > +++ b/meson.build > -@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' > +@@ -515,7 +515,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' > pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) > > pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) > -pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' > +pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' > - pkgconfig_variables += 'httpbackend=' + get_option('http_backend') > > pkgconfig.generate( > + libflatpak, > -- > -2.34.1 > +2.43.0 > > diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb > similarity index 90% > rename from meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb > rename to meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb > index a51937ea72..b5803e00a4 100644 > --- a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb > +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb > @@ -4,11 +4,11 @@ LICENSE = "LGPL-2.1-only" > LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" > > SRC_URI = " \ > - git://github.com/flatpak/flatpak;protocol=https;branch=main \ > + git://github.com/flatpak/flatpak;protocol=https;branch=main;tag=${PV} \ > file://0001-flatpak-pc-add-pc_sysrootdir.patch \ > " > > -SRCREV = "0835c0272f3a0389f97b02cad4b208f80fec99ed" > +SRCREV = "20599618d623630f7aa38d61a2bb81d86fb25f09" > > > inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd > @@ -49,11 +49,9 @@ GTKDOC_MESON_OPTION = 'gtkdoc' > GTKDOC_MESON_ENABLE_FLAG = 'enabled' > GTKDOC_MESON_DISABLE_FLAG = 'disabled' > > -PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" Didn't curl turn into an unconditional dependency, which should be always present now? (Or maybe it is pulled in indirectly by another dependency?) > PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf" > PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" > PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" > -PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" > PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" > PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" > PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" > @@ -62,7 +60,6 @@ PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,lib > PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" > > PACKAGECONFIG ?= " \ > - curl \ > ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#122817): https://lists.openembedded.org/g/openembedded-devel/message/122817 > Mute This Topic: https://lists.openembedded.org/mt/116912723/6084445 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [skandigraun@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch index 08d5625fa7..6207ae617b 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch +++ b/meta-oe/recipes-extended/flatpak/flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch @@ -7,22 +7,25 @@ Signed-off-by: Markus Volk <f_l_k@t-online.de> --- Upstream-Status: Inappropriate [oe-specific] +Update for 1.17.2. +Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> +--- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 4a0b865e..5f69b1d9 100644 +index e97b8cef..5c8de55f 100644 --- a/meson.build +++ b/meson.build -@@ -509,7 +509,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' +@@ -515,7 +515,7 @@ pkgconfig_variables += 'exec_prefix=${prefix}' pkgconfig_variables += 'datadir=' + ('${prefix}' / get_option('datadir')) pkgconfig_variables += 'datarootdir=' + ('${prefix}' / get_option('datadir')) -pkgconfig_variables += 'interfaces_dir=${datadir}/dbus-1/interfaces/' +pkgconfig_variables += 'interfaces_dir=${pc_sysrootdir}${datadir}/dbus-1/interfaces/' - pkgconfig_variables += 'httpbackend=' + get_option('http_backend') pkgconfig.generate( + libflatpak, -- -2.34.1 +2.43.0 diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb similarity index 90% rename from meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb rename to meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb index a51937ea72..b5803e00a4 100644 --- a/meta-oe/recipes-extended/flatpak/flatpak_1.17.0.bb +++ b/meta-oe/recipes-extended/flatpak/flatpak_1.17.2.bb @@ -4,11 +4,11 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ - git://github.com/flatpak/flatpak;protocol=https;branch=main \ + git://github.com/flatpak/flatpak;protocol=https;branch=main;tag=${PV} \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ " -SRCREV = "0835c0272f3a0389f97b02cad4b208f80fec99ed" +SRCREV = "20599618d623630f7aa38d61a2bb81d86fb25f09" inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check useradd @@ -49,11 +49,9 @@ GTKDOC_MESON_OPTION = 'gtkdoc' GTKDOC_MESON_ENABLE_FLAG = 'enabled' GTKDOC_MESON_DISABLE_FLAG = 'disabled' -PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf" PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" -PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,xauth socat-native" PACKAGECONFIG[xauth] = "-Dxauth=enabled,-Dxauth=disabled,xauth" PACKAGECONFIG[seccomp] = "-Dseccomp=enabled,-Dseccomp=disabled,libseccomp" @@ -62,7 +60,6 @@ PACKAGECONFIG[selinux] = "-Dselinux_module=enabled,-Dselinux_module=disabled,lib PACKAGECONFIG[wayland-security-context] = "-Dwayland_security_context=enabled,-Dwayland_security_context=disabled,wayland wayland-native wayland-protocols" PACKAGECONFIG ?= " \ - curl \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xauth', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'seccomp', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \
1. Changelog: https://github.com/flatpak/flatpak/releases/tag/1.17.2 2. Update 0001-flatpak-pc-add-pc_sysrootdir.patch for 1.17.2 3. Remove http_backend related options as they were removed in 1.17.2 Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> --- .../flatpak/0001-flatpak-pc-add-pc_sysrootdir.patch | 11 +++++++---- .../flatpak/{flatpak_1.17.0.bb => flatpak_1.17.2.bb} | 7 ++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename meta-oe/recipes-extended/flatpak/{flatpak_1.17.0.bb => flatpak_1.17.2.bb} (90%)