[meta-gnome][PATCH] metacity: Use autotools-brokensep

[meta-gnome][PATCH] metacity: Use autotools-brokensep

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

The split build directory causes a make error because
build/src/core is not created during the build but generated
sources are moved to it which fails.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
index a5c704740..969fe13dd 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
@@ -21,6 +21,8 @@ DEPENDS = " \
 # depends on startup-notification which depends on virtual/libx11
 REQUIRED_DISTRO_FEATURES = "x11"
 
+GNOMEBASEBUILDCLASS = "autotools-brokensep"
+
 inherit gnomebase gsettings gettext upstream-version-is-even features_check
 
 SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
-- 
2.31.1

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Khem Raj]

On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
> From: Zoltán Böszörményi <zboszor@gmail.com>
> 
> The split build directory causes a make error because
> build/src/core is not created during the build but generated
> sources are moved to it which fails.
> 
> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> ---
>   meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> index a5c704740..969fe13dd 100644
> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> @@ -21,6 +21,8 @@ DEPENDS = " \
>   # depends on startup-notification which depends on virtual/libx11
>   REQUIRED_DISTRO_FEATURES = "x11"
>   
> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
> +

this does not fail on jenkins so I wonder what are the conditions to 
reproduce it.

>   inherit gnomebase gsettings gettext upstream-version-is-even features_check
>   
>   SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
> 
> 
> 
> 
> 

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Zoltan Boszormenyi]

2021. 08. 27. 18:49 keltezéssel, Khem Raj írta:
> 
> 
> On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
>> From: Zoltán Böszörményi <zboszor@gmail.com>
>>
>> The split build directory causes a make error because
>> build/src/core is not created during the build but generated
>> sources are moved to it which fails.
>>
>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
>> ---
>>   meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb 
>> b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>> index a5c704740..969fe13dd 100644
>> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>> @@ -21,6 +21,8 @@ DEPENDS = " \
>>   # depends on startup-notification which depends on virtual/libx11
>>   REQUIRED_DISTRO_FEATURES = "x11"
>> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
>> +
> 
> this does not fail on jenkins so I wonder what are the conditions to reproduce it.

Fedora 33 build host, master branches of oe-core and meta-oe.
I also use meta-clang and meta-intel.

The commit message says it all. metacity-3.40.0/src/core exists
because it was there in the tarball, but build/src/core does
not get created automatically for some reason here.

I can carry this assignment or the equivalent B = "${S}" in my local bbappend.

Best regards,
Zoltán Böszörményi

> 
>>   inherit gnomebase gsettings gettext upstream-version-is-even features_check
>>   SRC_URI[archive.sha256sum] = 
>> "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
>>
>>
>>
>>
>>
> 
> 
> 
> 

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Khem Raj]

On Fri, Aug 27, 2021 at 10:04 AM Böszörményi Zoltán <zboszor@pr.hu> wrote:
>
> 2021. 08. 27. 18:49 keltezéssel, Khem Raj írta:
> >
> >
> > On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
> >> From: Zoltán Böszörményi <zboszor@gmail.com>
> >>
> >> The split build directory causes a make error because
> >> build/src/core is not created during the build but generated
> >> sources are moved to it which fails.
> >>
> >> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> >> ---
> >>   meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
> >>   1 file changed, 2 insertions(+)
> >>
> >> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >> b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >> index a5c704740..969fe13dd 100644
> >> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >> @@ -21,6 +21,8 @@ DEPENDS = " \
> >>   # depends on startup-notification which depends on virtual/libx11
> >>   REQUIRED_DISTRO_FEATURES = "x11"
> >> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
> >> +
> >
> > this does not fail on jenkins so I wonder what are the conditions to reproduce it.
>
> Fedora 33 build host, master branches of oe-core and meta-oe.
> I also use meta-clang and meta-intel.
>
> The commit message says it all. metacity-3.40.0/src/core exists
> because it was there in the tarball, but build/src/core does
> not get created automatically for some reason here.

the builders are ubuntu 18.04 and I wonder if there is some race
condition here in creating these dirs
Does it happen all the time?

>
> I can carry this assignment or the equivalent B = "${S}" in my local bbappend.
>

I think if we can understand the underlying problem we can fix it in
code itself.

> Best regards,
> Zoltán Böszörményi
>
> >
> >>   inherit gnomebase gsettings gettext upstream-version-is-even features_check
> >>   SRC_URI[archive.sha256sum] =
> >> "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
> >>
> >>
> >>
> >>
> >>
> >
> >
> > 
> >
>

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Zoltan Boszormenyi]

(Resending from the subscriber email.)

2021. 08. 27. 19:11 keltezéssel, Khem Raj írta:
> On Fri, Aug 27, 2021 at 10:04 AM Böszörményi Zoltán <zboszor@pr.hu> wrote:
>>
>> 2021. 08. 27. 18:49 keltezéssel, Khem Raj írta:
>>>
>>>
>>> On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
>>>> From: Zoltán Böszörményi <zboszor@gmail.com>
>>>>
>>>> The split build directory causes a make error because
>>>> build/src/core is not created during the build but generated
>>>> sources are moved to it which fails.
>>>>
>>>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
>>>> ---
>>>>    meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
>>>>    1 file changed, 2 insertions(+)
>>>>
>>>> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>> b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>> index a5c704740..969fe13dd 100644
>>>> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>> @@ -21,6 +21,8 @@ DEPENDS = " \
>>>>    # depends on startup-notification which depends on virtual/libx11
>>>>    REQUIRED_DISTRO_FEATURES = "x11"
>>>> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
>>>> +
>>>
>>> this does not fail on jenkins so I wonder what are the conditions to reproduce it.
>>
>> Fedora 33 build host, master branches of oe-core and meta-oe.
>> I also use meta-clang and meta-intel.
>>
>> The commit message says it all. metacity-3.40.0/src/core exists
>> because it was there in the tarball, but build/src/core does
>> not get created automatically for some reason here.
> 
> the builders are ubuntu 18.04 and I wonder if there is some race
> condition here in creating these dirs
> Does it happen all the time?

For me, it's 3 failures out of 3 attempts.

> 
>>
>> I can carry this assignment or the equivalent B = "${S}" in my local bbappend.
>>
> 
> I think if we can understand the underlying problem we can fix it in
> code itself.

The attached proof of concept patch helps.
(Only not attaching this time, sending a properly signed patch to the list instead.)

> 
>> Best regards,
>> Zoltán Böszörményi
>>
>>>
>>>>    inherit gnomebase gsettings gettext upstream-version-is-even features_check
>>>>    SRC_URI[archive.sha256sum] =
>>>> "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
>>>>
>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>> 
>>>
>>

[meta-gnome][PATCH] metacity: Add a patch to create build/src/core before moving generated sources to it

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 ...before-moving-generated-sources-into.patch | 49 +++++++++++++++++++
 .../recipes-gnome/metacity/metacity_3.40.0.bb |  5 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-Create-src-core-before-moving-generated-sources-into.patch

diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-Create-src-core-before-moving-generated-sources-into.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-Create-src-core-before-moving-generated-sources-into.patch
new file mode 100644
index 000000000..935a31d09
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-Create-src-core-before-moving-generated-sources-into.patch
@@ -0,0 +1,49 @@
+From b2f31fc2ce5a7bc14c084ddbe6ec12578c1aaf29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Sat, 28 Aug 2021 05:58:25 +0200
+Subject: [PATCH] Create src/core before moving generated sources into it
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With split build and source directories, there's a reproducible
+make failure:
+
+| Making all in src
+| make[2]: Entering directory '.../metacity/1_3.40.0-r0/build/src'
+| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.c.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h  > \
+| 	meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
+| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.h.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h  > \
+| 	meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
+| mv: cannot move 'meta-enum-types.c.tmp' to 'core/meta-enum-types.c'mv: cannot move 'meta-enum-types.h.tmp' to 'core/meta-enum-types.h': No such file or directory
+| : No such file or directory
+| make[2]: *** [Makefile:2240: core/meta-enum-types.c] Error 1
+
+Upstream-Status: Inappropriate [oe-specific]
+
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f86af600..487c30d3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -204,10 +204,12 @@ ENUM_TYPES = \
+ 	$(NULL)
+ 
+ core/meta-enum-types.c: core/meta-enum-types.c.in $(ENUM_TYPES) Makefile.am
++	$(MKDIR_P) $(builddir)/core
+ 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.c.in $(ENUM_TYPES) > \
+ 		meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
+ 
+ core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) Makefile.am
++	$(MKDIR_P) $(builddir)/core
+ 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.h.in $(ENUM_TYPES) > \
+ 		meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
+ 
+-- 
+2.31.1
+
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
index a5c704740..0fd631fba 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
@@ -24,7 +24,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 inherit gnomebase gsettings gettext upstream-version-is-even features_check
 
 SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
-SRC_URI += "file://0001-drop-zenity-detection.patch"
+SRC_URI += " \
+    file://0001-drop-zenity-detection.patch \
+    file://0001-Create-src-core-before-moving-generated-sources-into.patch \
+"
 
 PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
 # enable as neccessary until new warnings are dealt with
-- 
2.31.1

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Khem Raj]

this patch is better, perhaps worth sharing with metacirty upstream as well.

On Fri, Aug 27, 2021 at 9:16 PM Böszörményi Zoltán <zboszor@pr.hu> wrote:
>
> (Resending from the subscriber email.)
>
> 2021. 08. 27. 19:11 keltezéssel, Khem Raj írta:
> > On Fri, Aug 27, 2021 at 10:04 AM Böszörményi Zoltán <zboszor@pr.hu> wrote:
> >>
> >> 2021. 08. 27. 18:49 keltezéssel, Khem Raj írta:
> >>>
> >>>
> >>> On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
> >>>> From: Zoltán Böszörményi <zboszor@gmail.com>
> >>>>
> >>>> The split build directory causes a make error because
> >>>> build/src/core is not created during the build but generated
> >>>> sources are moved to it which fails.
> >>>>
> >>>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
> >>>> ---
> >>>>    meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
> >>>>    1 file changed, 2 insertions(+)
> >>>>
> >>>> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >>>> b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >>>> index a5c704740..969fe13dd 100644
> >>>> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >>>> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
> >>>> @@ -21,6 +21,8 @@ DEPENDS = " \
> >>>>    # depends on startup-notification which depends on virtual/libx11
> >>>>    REQUIRED_DISTRO_FEATURES = "x11"
> >>>> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
> >>>> +
> >>>
> >>> this does not fail on jenkins so I wonder what are the conditions to reproduce it.
> >>
> >> Fedora 33 build host, master branches of oe-core and meta-oe.
> >> I also use meta-clang and meta-intel.
> >>
> >> The commit message says it all. metacity-3.40.0/src/core exists
> >> because it was there in the tarball, but build/src/core does
> >> not get created automatically for some reason here.
> >
> > the builders are ubuntu 18.04 and I wonder if there is some race
> > condition here in creating these dirs
> > Does it happen all the time?
>
> For me, it's 3 failures out of 3 attempts.
>
> >
> >>
> >> I can carry this assignment or the equivalent B = "${S}" in my local bbappend.
> >>
> >
> > I think if we can understand the underlying problem we can fix it in
> > code itself.
>
> The attached proof of concept patch helps.
> (Only not attaching this time, sending a properly signed patch to the list instead.)
>
> >
> >> Best regards,
> >> Zoltán Böszörményi
> >>
> >>>
> >>>>    inherit gnomebase gsettings gettext upstream-version-is-even features_check
> >>>>    SRC_URI[archive.sha256sum] =
> >>>> "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>
> >>>
> >>>
> >>> 
> >>>
> >>
>

Re: [oe] [meta-gnome][PATCH] metacity: Use autotools-brokensep

[Zoltan Boszormenyi]

2021. 08. 28. 6:34 keltezéssel, Khem Raj írta:
> this patch is better, perhaps worth sharing with metacirty upstream as well.

I don't know if they backport to older GNOME releases,
but I have submitted an MR against metacity's master branch.

https://gitlab.gnome.org/GNOME/metacity/-/merge_requests/24

> 
> On Fri, Aug 27, 2021 at 9:16 PM Böszörményi Zoltán <zboszor@pr.hu> wrote:
>>
>> (Resending from the subscriber email.)
>>
>> 2021. 08. 27. 19:11 keltezéssel, Khem Raj írta:
>>> On Fri, Aug 27, 2021 at 10:04 AM Böszörményi Zoltán <zboszor@pr.hu> wrote:
>>>>
>>>> 2021. 08. 27. 18:49 keltezéssel, Khem Raj írta:
>>>>>
>>>>>
>>>>> On 8/27/21 1:43 AM, Zoltan Boszormenyi via lists.openembedded.org wrote:
>>>>>> From: Zoltán Böszörményi <zboszor@gmail.com>
>>>>>>
>>>>>> The split build directory causes a make error because
>>>>>> build/src/core is not created during the build but generated
>>>>>> sources are moved to it which fails.
>>>>>>
>>>>>> Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
>>>>>> ---
>>>>>>     meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb | 2 ++
>>>>>>     1 file changed, 2 insertions(+)
>>>>>>
>>>>>> diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>>>> b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>>>> index a5c704740..969fe13dd 100644
>>>>>> --- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>>>> +++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
>>>>>> @@ -21,6 +21,8 @@ DEPENDS = " \
>>>>>>     # depends on startup-notification which depends on virtual/libx11
>>>>>>     REQUIRED_DISTRO_FEATURES = "x11"
>>>>>> +GNOMEBASEBUILDCLASS = "autotools-brokensep"
>>>>>> +
>>>>>
>>>>> this does not fail on jenkins so I wonder what are the conditions to reproduce it.
>>>>
>>>> Fedora 33 build host, master branches of oe-core and meta-oe.
>>>> I also use meta-clang and meta-intel.
>>>>
>>>> The commit message says it all. metacity-3.40.0/src/core exists
>>>> because it was there in the tarball, but build/src/core does
>>>> not get created automatically for some reason here.
>>>
>>> the builders are ubuntu 18.04 and I wonder if there is some race
>>> condition here in creating these dirs
>>> Does it happen all the time?
>>
>> For me, it's 3 failures out of 3 attempts.
>>
>>>
>>>>
>>>> I can carry this assignment or the equivalent B = "${S}" in my local bbappend.
>>>>
>>>
>>> I think if we can understand the underlying problem we can fix it in
>>> code itself.
>>
>> The attached proof of concept patch helps.
>> (Only not attaching this time, sending a properly signed patch to the list instead.)
>>
>>>
>>>> Best regards,
>>>> Zoltán Böszörményi
>>>>
>>>>>
>>>>>>     inherit gnomebase gsettings gettext upstream-version-is-even features_check
>>>>>>     SRC_URI[archive.sha256sum] =
>>>>>> "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>> 
>>>>>
>>>>
>>

[meta-gnome][PATCH v2] metacity: Add a patch to create build/src/core before moving generated sources to it

[Zoltan Boszormenyi]

From: Zoltán Böszörményi <zboszor@gmail.com>

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
---
 ...ild-with-disable-dependency-tracking.patch | 65 +++++++++++++++++++
 .../recipes-gnome/metacity/metacity_3.40.0.bb |  5 +-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch

diff --git a/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch b/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch
new file mode 100644
index 000000000..864d0baa2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/metacity/metacity/0001-fix-build-with-disable-dependency-tracking.patch
@@ -0,0 +1,65 @@
+From 632670273cc880917e78a152a3ae39e209b57864 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
+ <zboszor@gmail.com>
+Date: Sat, 28 Aug 2021 05:58:25 +0200
+Subject: [PATCH] fix build with --disable-dependency-tracking
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With split build and source directories AND --disable-dependency-tracking
+(like the way Yocto builds are done) there's a reproducible make
+failure on my Fedora 33 build host:
+
+| Making all in src
+| make[2]: Entering directory '.../metacity/1_3.40.0-r0/build/src'
+| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.c.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h  > \
+| 	meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
+| .../metacity/1_3.40.0-r0/recipe-sysroot-native/usr/bin/glib-mkenums --template ../../metacity-3.40.0/src/core/meta-enum-types.h.in ../../metacity-3.40.0/src/core/window-private.h ../../metacity-3.40.0/src/include/meta-compositor.h  > \
+| 	meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
+| mv: cannot move 'meta-enum-types.c.tmp' to 'core/meta-enum-types.c'mv: cannot move 'meta-enum-types.h.tmp' to 'core/meta-enum-types.h': No such file or directory
+| : No such file or directory
+| make[2]: *** [Makefile:2240: core/meta-enum-types.c] Error 1
+
+https://gitlab.gnome.org/GNOME/metacity/-/merge_requests/24
+
+Upstream-Status: Pending
+
+Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
+---
+ configure.ac    | 1 +
+ src/Makefile.am | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index ebb00b85..04aafb94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -139,6 +139,7 @@ dnl **************************************************************************
+ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+ 
+ AC_PROG_CC
++AC_PROG_MKDIR_P
+ AC_ISC_POSIX
+ AC_HEADER_STDC
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f86af600..4aa3fdae 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -204,10 +204,12 @@ ENUM_TYPES = \
+ 	$(NULL)
+ 
+ core/meta-enum-types.c: core/meta-enum-types.c.in $(ENUM_TYPES) Makefile.am
++	$(MKDIR_P) core
+ 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.c.in $(ENUM_TYPES) > \
+ 		meta-enum-types.c.tmp && mv meta-enum-types.c.tmp core/meta-enum-types.c
+ 
+ core/meta-enum-types.h: core/meta-enum-types.h.in $(ENUM_TYPES) Makefile.am
++	$(MKDIR_P) core
+ 	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(srcdir)/core/meta-enum-types.h.in $(ENUM_TYPES) > \
+ 		meta-enum-types.h.tmp && mv meta-enum-types.h.tmp core/meta-enum-types.h
+ 
+-- 
+2.31.1
+
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
index a5c704740..e7570ec59 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.40.0.bb
@@ -24,7 +24,10 @@ REQUIRED_DISTRO_FEATURES = "x11"
 inherit gnomebase gsettings gettext upstream-version-is-even features_check
 
 SRC_URI[archive.sha256sum] = "224c1f65487eac21f0c1d9856152343768ee726c48b1a8a2835a46a8ad9015b5"
-SRC_URI += "file://0001-drop-zenity-detection.patch"
+SRC_URI += " \
+    file://0001-drop-zenity-detection.patch \
+    file://0001-fix-build-with-disable-dependency-tracking.patch \
+"
 
 PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
 # enable as neccessary until new warnings are dealt with
-- 
2.31.1