Thanks, applied as a9c41212d0426f527bf81d4a874889578d7ec6b3. Michael
[sent from post-receive hook] On Sat, 09 Nov 2024 08:07:42 +0100, Christian Melki <[email protected]> wrote: > Minor changes. Some recommended/alternate paths and loading mechanisms. > https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.15.12/NEWS#L62 > > * Forward patches with minor offset adjustment. Applies cleanly. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/dbus-1.15.10/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > > b/patches/dbus-1.15.12/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > similarity index 90% > rename from > patches/dbus-1.15.10/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > rename to > patches/dbus-1.15.12/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > index 971cab3c3a87..ab0fec4dd9d9 100644 > --- > a/patches/dbus-1.15.10/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > +++ > b/patches/dbus-1.15.12/0001-HACK-meson_post_install.py-don-t-try-to-change-owner.patch > @@ -15,10 +15,10 @@ Signed-off-by: Michael Olbrich <[email protected]> > 1 file changed, 1 deletion(-) > > diff --git a/meson_post_install.py b/meson_post_install.py > -index cfc03b2219ff..1d007ad65e6e 100755 > +index fe0633458c4f..0f29554921f3 100755 > --- a/meson_post_install.py > +++ b/meson_post_install.py > -@@ -103,4 +103,3 @@ def post_install_exe(): > +@@ -127,4 +127,3 @@ def post_install_exe(): > > if __name__ == "__main__": > post_install_relocation() > diff --git a/patches/dbus-1.15.10/series b/patches/dbus-1.15.12/series > similarity index 100% > rename from patches/dbus-1.15.10/series > rename to patches/dbus-1.15.12/series > diff --git a/rules/dbus.make b/rules/dbus.make > index dba3f82ca4af..f2bc7b552898 100644 > --- a/rules/dbus.make > +++ b/rules/dbus.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus > # > # Paths and names > # > -DBUS_VERSION := 1.15.10 > -DBUS_MD5 := b35ee789084a216fbddb933b84c75516 > +DBUS_VERSION := 1.15.12 > +DBUS_MD5 := cc1a1e2ae4ad166ed3d3da36172bbb8a > DBUS := dbus-$(DBUS_VERSION) > DBUS_SUFFIX := tar.xz > DBUS_URL := > https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
