From eff03142bf9fc5f507ea610359703751bc5f7961 Mon Sep 17 00:00:00 2001 From: Florian Müllner Date: Aug 10 2022 18:46:49 +0000 Subject: Update to 43.beta --- diff --git a/.gitignore b/.gitignore index 4d50036..c7ed816 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,4 @@ mutter-2.31.5.tar.bz2 /mutter-42.1.tar.xz /mutter-42.2.tar.xz /mutter-43.alpha.tar.xz +/mutter-43.beta.tar.xz diff --git a/0001-build-Add-missing-include.patch b/0001-build-Add-missing-include.patch new file mode 100644 index 0000000..dc8c5c8 --- /dev/null +++ b/0001-build-Add-missing-include.patch @@ -0,0 +1,27 @@ +From b0607154668f9f3e8a5959470a1fc7f601e66b77 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Wed, 10 Aug 2022 20:13:24 +0200 +Subject: [PATCH] build: Add missing include + +util-private.h includes glib-i18n-lib.h, which requires GETTEXT_PACKAGE +to be defined. The define comes from config.h, +but that cannot be included in headers, so we have to make sure +that any source file that pulls in util-private.h (or a header +that includes it) includes config.h first. +--- + src/meta-private-enum-types.c.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/meta-private-enum-types.c.in b/src/meta-private-enum-types.c.in +index c2479a91a..55cd855ca 100644 +--- a/src/meta-private-enum-types.c.in ++++ b/src/meta-private-enum-types.c.in +@@ -1,4 +1,5 @@ + /*** BEGIN file-header ***/ ++#include "config.h" + #include "meta-private-enum-types.h" + /*** END file-header ***/ + +-- +2.36.1 + diff --git a/mutter.spec b/mutter.spec index f0fed82..db0f5c4 100644 --- a/mutter.spec +++ b/mutter.spec @@ -9,8 +9,8 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: mutter -Version: 43~alpha -Release: 2%{?dist} +Version: 43~beta +Release: 1%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -26,6 +26,8 @@ Patch1: 0001-Revert-build-Do-not-provide-built-sources-as-libmutt.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1936991 Patch2: mutter-42.alpha-disable-tegra.patch +Patch3: 0001-build-Add-missing-include.patch + BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.41.0 BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(libwacom) @@ -169,6 +171,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter-%{mutter_api_version}/tests %changelog +* Wed Aug 10 2022 Florian Müllner - 43~beta-1 +- Update to 43.beta + * Fri Jul 22 2022 Fedora Release Engineering - 43~alpha-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 41ea14c..ae06a2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mutter-43.alpha.tar.xz) = e6324113b84492eaa5656cec436189fc3e668148aca24535287da7665c8a814d84357511daa5350429bd401628ff221c938dfa3c99669f13edd9dd69a44783d3 +SHA512 (mutter-43.beta.tar.xz) = 027629387a17ddd84814aa385f9b0be2befe2d0c9b2d514ecefdb78d11c2d6dda86bdd1ac7d93c5c1beb61a8284c7b7813f93bd13df7c71a80cb872ebb2ba397