From f0e0722a303819bfce1c7da193d4e77682e0bc52 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Apr 07 2022 11:45:13 +0000 Subject: Update to version 6.3.1; Fixes RHBZ#2072919 --- diff --git a/.gitignore b/.gitignore index 376ab5b..adfffbb 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ /gala-6.0.1.tar.gz /gala-6.2.0.tar.gz /gala-6.2.1.tar.gz +/gala-6.3.0.tar.gz +/gala-6.3.1.tar.gz diff --git a/00-fedora-default-settings.patch b/00-fedora-default-settings.patch deleted file mode 100644 index 7e81654..0000000 --- a/00-fedora-default-settings.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml -index 872a979..1de3a2d 100644 ---- a/data/gala.gschema.xml -+++ b/data/gala.gschema.xml -@@ -26,7 +26,7 @@ - - - -- "none" -+ "open-launcher" - Action for the top left corner - - -@@ -71,7 +71,7 @@ - DEPRECATED: This key is deprecated and ignored. - - -- '' -+ 'io.elementary.wingpanel --toggle-indicator=app-launcher' - Panel main menu action - Sets the command to run when the panel-main-menu keybinding is pressed. - -@@ -81,7 +81,7 @@ - - - -- '' -+ 'io.elementary.wingpanel --toggle-indicator=app-launcher' - - - -@@ -179,7 +179,7 @@ - When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window. - - -- 'close:maximize' -+ 'close:menu,maximize' - Arrangement of buttons on the titlebar - Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons. - diff --git a/0000-Modify-default-settings-for-Fedora.patch b/0000-Modify-default-settings-for-Fedora.patch new file mode 100644 index 0000000..44db9b3 --- /dev/null +++ b/0000-Modify-default-settings-for-Fedora.patch @@ -0,0 +1,52 @@ +From be3f4b53198b0abe3cb6cb74d8f0e2b6332d68e2 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 14 Mar 2022 15:22:50 +0100 +Subject: [PATCH 0/5] Modify default settings for Fedora + +--- + data/gala.gschema.xml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml +index 872a9795..1de3a2d9 100644 +--- a/data/gala.gschema.xml ++++ b/data/gala.gschema.xml +@@ -26,7 +26,7 @@ + + + +- "none" ++ "open-launcher" + Action for the top left corner + + +@@ -71,7 +71,7 @@ + DEPRECATED: This key is deprecated and ignored. + + +- '' ++ 'io.elementary.wingpanel --toggle-indicator=app-launcher' + Panel main menu action + Sets the command to run when the panel-main-menu keybinding is pressed. + +@@ -81,7 +81,7 @@ + + + +- '' ++ 'io.elementary.wingpanel --toggle-indicator=app-launcher' + + + +@@ -179,7 +179,7 @@ + When true, instead of having independent titlebars, modal dialogs appear attached to the titlebar of the parent window and are moved together with the parent window. + + +- 'close:maximize' ++ 'close:menu,maximize' + Arrangement of buttons on the titlebar + Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future metacity versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons. + +-- +2.35.1 + diff --git a/gala.spec b/gala.spec index 31b5e08..041f969 100644 --- a/gala.spec +++ b/gala.spec @@ -2,20 +2,20 @@ Name: gala Summary: Gala window manager -Version: 6.2.1 +Version: 6.3.1 Release: %autorelease License: GPLv3+ URL: https://github.com/elementary/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -# patch some default settings to better match fedora -Patch0: 00-fedora-default-settings.patch +# patch some default settings to better match Fedora +Patch0: 0000-Modify-default-settings-for-Fedora.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib -BuildRequires: meson >= 0.48.0 +BuildRequires: meson >= 0.50.0 BuildRequires: vala >= 0.28.0 BuildRequires: mesa-libEGL-devel @@ -34,7 +34,6 @@ BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(mutter-clutter-8) BuildRequires: pkgconfig(mutter-cogl-8) BuildRequires: pkgconfig(mutter-cogl-pango-8) -BuildRequires: pkgconfig(plank) >= 0.11.0 Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -75,7 +74,7 @@ This package contains the development headers. %build -%meson +%meson -Dsystemd=false %meson_build diff --git a/sources b/sources index cc52108..efeb8b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gala-6.2.1.tar.gz) = 8a96219d337ed4fe1015e913c3ff0ebbd84e374dbc2ce219d0dc2801cd301a50ceae07f24c94d624c7309f26ba4e57dc712a06ddcdb708c54d947dcf472010ef +SHA512 (gala-6.3.1.tar.gz) = bcdc73266494014029f1a4612cfb4b43870430cba0f2b3ec00fea0b8dd7abb76e8a2a7c30fe129fcf709b59cc16e2d834579f186239c1972bfa4943c06492e22