Compare commits
No commits in common. "99b15837fcbd59f44bf83a460fdfea16fcc33737" and "e24d3fdb8aeac3399d25046197895939701595b2" have entirely different histories.
99b15837fc
...
e24d3fdb8a
@ -1,29 +0,0 @@
|
|||||||
From 99361f28c8763ea4569b5ae9876028d53ac9a234 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
|
|
||||||
Date: Sun, 24 May 2020 13:58:51 +0300
|
|
||||||
Subject: [PATCH] compositor-vulkan: fix build
|
|
||||||
|
|
||||||
VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE enum was removed in 1.2.140.
|
|
||||||
|
|
||||||
https://gitlab.gnome.org/GNOME/metacity/-/issues/10
|
|
||||||
---
|
|
||||||
src/compositor/meta-compositor-vulkan.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/compositor/meta-compositor-vulkan.c b/src/compositor/meta-compositor-vulkan.c
|
|
||||||
index b87b5194d..53b7b3ffc 100644
|
|
||||||
--- a/src/compositor/meta-compositor-vulkan.c
|
|
||||||
+++ b/src/compositor/meta-compositor-vulkan.c
|
|
||||||
@@ -810,7 +810,9 @@ device_type_to_string (VkPhysicalDeviceType type)
|
|
||||||
return "cpu";
|
|
||||||
break;
|
|
||||||
|
|
||||||
+#if VK_HEADER_VERSION < 140
|
|
||||||
case VK_PHYSICAL_DEVICE_TYPE_RANGE_SIZE:
|
|
||||||
+#endif
|
|
||||||
case VK_PHYSICAL_DEVICE_TYPE_MAX_ENUM:
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
From bd5f8743e9ec6697d45077dd3a4d6f8f704445e3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
|
|
||||||
Date: Mon, 10 Jul 2023 18:31:57 +0300
|
|
||||||
Subject: [PATCH] keybindings: remove window shading
|
|
||||||
|
|
||||||
Related GSettings key has been removed:
|
|
||||||
https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/-/commit/9726c5e92dbb65d410033d478e94ce900438884c
|
|
||||||
---
|
|
||||||
src/core/keybindings.c | 21 ---------------------
|
|
||||||
src/include/prefs.h | 1 -
|
|
||||||
2 files changed, 22 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
|
|
||||||
index 63766e19d..ca864ce89 100644
|
|
||||||
--- a/src/core/keybindings.c
|
|
||||||
+++ b/src/core/keybindings.c
|
|
||||||
@@ -2127,7 +2127,6 @@ process_tab_grab (MetaDisplay *display,
|
|
||||||
case META_KEYBINDING_ACTION_TOGGLE_ABOVE:
|
|
||||||
case META_KEYBINDING_ACTION_MAXIMIZE:
|
|
||||||
case META_KEYBINDING_ACTION_UNMAXIMIZE:
|
|
||||||
- case META_KEYBINDING_ACTION_TOGGLE_SHADED:
|
|
||||||
case META_KEYBINDING_ACTION_MINIMIZE:
|
|
||||||
case META_KEYBINDING_ACTION_CLOSE:
|
|
||||||
case META_KEYBINDING_ACTION_BEGIN_MOVE:
|
|
||||||
@@ -2986,19 +2985,6 @@ handle_unmaximize (MetaDisplay *display,
|
|
||||||
META_MAXIMIZE_VERTICAL);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void
|
|
||||||
-handle_toggle_shaded (MetaDisplay *display,
|
|
||||||
- MetaScreen *screen,
|
|
||||||
- MetaWindow *window,
|
|
||||||
- XEvent *event,
|
|
||||||
- MetaKeyBinding *binding)
|
|
||||||
-{
|
|
||||||
- if (window->shaded)
|
|
||||||
- meta_window_unshade (window, event->xkey.time);
|
|
||||||
- else if (window->has_shade_func)
|
|
||||||
- meta_window_shade (window, event->xkey.time);
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static void
|
|
||||||
handle_close (MetaDisplay *display,
|
|
||||||
MetaScreen *screen,
|
|
||||||
@@ -3582,13 +3568,6 @@ init_builtin_key_bindings (MetaDisplay *display)
|
|
||||||
META_KEYBINDING_ACTION_UNMAXIMIZE,
|
|
||||||
handle_unmaximize, 0);
|
|
||||||
|
|
||||||
- add_builtin_keybinding (display,
|
|
||||||
- "toggle-shaded",
|
|
||||||
- SCHEMA_COMMON_KEYBINDINGS,
|
|
||||||
- META_KEY_BINDING_PER_WINDOW,
|
|
||||||
- META_KEYBINDING_ACTION_TOGGLE_SHADED,
|
|
||||||
- handle_toggle_shaded, 0);
|
|
||||||
-
|
|
||||||
add_builtin_keybinding (display,
|
|
||||||
"minimize",
|
|
||||||
SCHEMA_COMMON_KEYBINDINGS,
|
|
||||||
diff --git a/src/include/prefs.h b/src/include/prefs.h
|
|
||||||
index 558c4a9d2..77ce29964 100644
|
|
||||||
--- a/src/include/prefs.h
|
|
||||||
+++ b/src/include/prefs.h
|
|
||||||
@@ -191,7 +191,6 @@ typedef enum _MetaKeyBindingAction
|
|
||||||
META_KEYBINDING_ACTION_TOGGLE_ABOVE,
|
|
||||||
META_KEYBINDING_ACTION_MAXIMIZE,
|
|
||||||
META_KEYBINDING_ACTION_UNMAXIMIZE,
|
|
||||||
- META_KEYBINDING_ACTION_TOGGLE_SHADED,
|
|
||||||
META_KEYBINDING_ACTION_MINIMIZE,
|
|
||||||
META_KEYBINDING_ACTION_CLOSE,
|
|
||||||
META_KEYBINDING_ACTION_BEGIN_MOVE,
|
|
||||||
@ -1,90 +0,0 @@
|
|||||||
From: wuchaochao <wuchaochao4@h-partners.com>
|
|
||||||
Date: Mon Feb 21 17:34:47 CST 2022
|
|
||||||
Subject: [PATCH] remove XResQueryClientIds to get pid
|
|
||||||
Signed-off-by: wuchaochao <wuchaochao4@h-partners.com>
|
|
||||||
---
|
|
||||||
configure.ac | 2 -+
|
|
||||||
src/core/window-props.c | 47 3 -----------------------------------------
|
|
||||||
2 files changed, 1 insertions(+), 49 deletion(-)
|
|
||||||
|
|
||||||
diff -Naur metacity-3.37.1/configure.ac m2/configure.ac
|
|
||||||
--- metacity-3.37.1/configure.ac 2020-05-01 23:26:06.000000000 +0800
|
|
||||||
+++ m2/configure.ac 2022-02-21 17:05:17.732000000 +0800
|
|
||||||
@@ -144,7 +144,7 @@
|
|
||||||
## byte order
|
|
||||||
AC_C_BIGENDIAN
|
|
||||||
|
|
||||||
-METACITY_PC_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION gsettings-desktop-schemas >= 3.3.0 xcomposite >= $XCOMPOSITE_REQUIRED_VERSION xfixes xrender xdamage xres"
|
|
||||||
+METACITY_PC_MODULES="gtk+-3.0 >= $GTK_REQUIRED_VERSION gio-2.0 >= $GLIB_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION gsettings-desktop-schemas >= 3.3.0 xcomposite >= $XCOMPOSITE_REQUIRED_VERSION xfixes xrender xdamage"
|
|
||||||
|
|
||||||
GLIB_GSETTINGS
|
|
||||||
|
|
||||||
diff -Naur metacity-3.37.1/src/core/window-props.c m2/src/core/window-props.c
|
|
||||||
--- metacity-3.37.1/src/core/window-props.c 2020-05-01 22:48:27.000000000 +0800
|
|
||||||
+++ m2/src/core/window-props.c 2022-02-21 17:08:17.524000000 +0800
|
|
||||||
@@ -43,7 +43,6 @@
|
|
||||||
#include "frame-private.h"
|
|
||||||
#include "group.h"
|
|
||||||
#include <X11/Xatom.h>
|
|
||||||
-#include <X11/extensions/XRes.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <errno.h>
|
|
||||||
@@ -396,56 +395,11 @@
|
|
||||||
window->role = g_strdup (value->v.str);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static pid_t
|
|
||||||
-get_local_pid (MetaWindow *window)
|
|
||||||
-{
|
|
||||||
- pid_t pid;
|
|
||||||
- XResClientIdSpec spec;
|
|
||||||
- long num_ids;
|
|
||||||
- XResClientIdValue *client_ids;
|
|
||||||
- long i;
|
|
||||||
-
|
|
||||||
- pid = -1;
|
|
||||||
-
|
|
||||||
- spec.client = window->xwindow;
|
|
||||||
- spec.mask = XRES_CLIENT_ID_PID_MASK;
|
|
||||||
-
|
|
||||||
- XResQueryClientIds (window->display->xdisplay,
|
|
||||||
- 1,
|
|
||||||
- &spec,
|
|
||||||
- &num_ids,
|
|
||||||
- &client_ids);
|
|
||||||
-
|
|
||||||
- for (i = 0; i < num_ids; i++)
|
|
||||||
- {
|
|
||||||
- if (client_ids[i].spec.mask == XRES_CLIENT_ID_PID_MASK)
|
|
||||||
- {
|
|
||||||
- pid = XResGetClientPid (&client_ids[i]);
|
|
||||||
- break;
|
|
||||||
- }
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- XResClientIdsDestroy (num_ids, client_ids);
|
|
||||||
-
|
|
||||||
- return pid;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static void
|
|
||||||
reload_net_wm_pid (MetaWindow *window,
|
|
||||||
MetaPropValue *value,
|
|
||||||
gboolean initial)
|
|
||||||
{
|
|
||||||
- pid_t pid;
|
|
||||||
-
|
|
||||||
- pid = get_local_pid (window);
|
|
||||||
-
|
|
||||||
- if (pid != -1)
|
|
||||||
- {
|
|
||||||
- meta_verbose ("Ignoring _NET_WM_PID in favor of XResGetClientPid\n");
|
|
||||||
-
|
|
||||||
- window->net_wm_pid = pid;
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
|
|
||||||
if (value->type != META_PROP_VALUE_INVALID)
|
|
||||||
{
|
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: metacity
|
Name: metacity
|
||||||
Version: 3.37.1
|
Version: 3.37.1
|
||||||
Release: 6
|
Release: 1
|
||||||
Summary: Window Manager for the MATE and GNOME Flashback desktops
|
Summary: Window Manager for the MATE and GNOME Flashback desktops
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://download.gnome.org/sources/metacity/
|
URL: https://download.gnome.org/sources/metacity/
|
||||||
@ -8,26 +8,16 @@ Source0: https://download.gnome.org/sources/metacity/3.37/%{name}-%{versi
|
|||||||
|
|
||||||
|
|
||||||
BuildRequires: libXinerama-devel libSM-devel libICE-devel libX11-devel desktop-file-utils itstool
|
BuildRequires: libXinerama-devel libSM-devel libICE-devel libX11-devel desktop-file-utils itstool
|
||||||
BuildRequires: autoconf, automake, gettext-devel, libtool, gnome-common yelp-tools zenity
|
BuildRequires: autoconf, automake, gettext-devel, libtool, gnome-common yelp-tools zenity vulkan-devel
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 pkgconfig(gio-2.0) >= 2.44.0
|
BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 pkgconfig(gio-2.0) >= 2.44.0
|
||||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) pkgconfig(pango)
|
BuildRequires: pkgconfig(gsettings-desktop-schemas) pkgconfig(pango) pkgconfig(libcanberra-gtk3)
|
||||||
%if %{?openEuler:1}0
|
|
||||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
|
||||||
BuildRequires: pkgconfig(xres) vulkan-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: pkgconfig(libstartup-notification-1.0) pkgconfig(xcomposite) pkgconfig(xfixes) pkgconfig(xrender)
|
BuildRequires: pkgconfig(libstartup-notification-1.0) pkgconfig(xcomposite) pkgconfig(xfixes) pkgconfig(xrender)
|
||||||
BuildRequires: pkgconfig(xdamage) pkgconfig(xrender) pkgconfig(xcursor) pkgconfig(libgtop-2.0)
|
BuildRequires: pkgconfig(xdamage) pkgconfig(xrender) pkgconfig(xcursor) pkgconfig(libgtop-2.0)
|
||||||
|
BuildRequires: pkgconfig(xres)
|
||||||
|
|
||||||
Requires: startup-notification gsettings-desktop-schemas zenity
|
Requires: startup-notification gsettings-desktop-schemas zenity
|
||||||
Provides: firstboot(windowmanager) = metacity
|
Provides: firstboot(windowmanager) = metacity
|
||||||
|
|
||||||
Patch6000: backport-compositor-vulkan-fix-build.patch
|
|
||||||
Patch6001: backport-remove-window-shading.patch
|
|
||||||
|
|
||||||
%if !0%{?openEuler}
|
|
||||||
Patch9000: huawei-remove-XResQueryClientIds-to-get-pid.patch
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Metacity is a small window manager, using GTK+ to do everything.
|
Metacity is a small window manager, using GTK+ to do everything.
|
||||||
It is developed mainly for the MATE and GNOME Flashback desktops.
|
It is developed mainly for the MATE and GNOME Flashback desktops.
|
||||||
@ -47,15 +37,11 @@ developing applications that use %{name}.
|
|||||||
rm -f src/org.gnome.metacity.gschema.valid
|
rm -f src/org.gnome.metacity.gschema.valid
|
||||||
|
|
||||||
%build
|
%build
|
||||||
CPPFLAGS="$CPPFLAGS -I%{_builddir}/%{_includedir}"
|
CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}"
|
||||||
export CPPFLAGS
|
export CPPFLAGS
|
||||||
rm -f configure
|
rm -f configure
|
||||||
(if ! test -x configure; then autoreconf -i -f; fi;
|
(if ! test -x configure; then autoreconf -i -f; fi;
|
||||||
%configure \
|
%configure --disable-schemas-compile)
|
||||||
%if !0%{?openEuler}
|
|
||||||
--disable-canberra \
|
|
||||||
%endif
|
|
||||||
--disable-schemas-compile)
|
|
||||||
|
|
||||||
make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
|
make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
|
||||||
|
|
||||||
@ -89,21 +75,6 @@ make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags}
|
|||||||
%{_mandir}/man1/*.gz
|
%{_mandir}/man1/*.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Feb 22 2024 zhangpan <zhangpan103@h-partners.com> - 3.37.1-6
|
|
||||||
- remove window shading
|
|
||||||
|
|
||||||
* Mon Aug 14 2023 liyunfei <liyunfei33@huawei.com> - 3.37.1-5
|
|
||||||
- fix install error with clang toolchain
|
|
||||||
|
|
||||||
* Mon Aug 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 3.37.1-4
|
|
||||||
- fix build error
|
|
||||||
|
|
||||||
* Fri Apr 1 2022 wuchaochao <wuchaochao4@h-partres.com> - 3.37.1-3
|
|
||||||
- remove XResQueryClientIds to get pid and remove BuildRequires:vulkan-devel
|
|
||||||
|
|
||||||
* Sat Mar 05 2022 hanhui <hanhui15@h-partners.com> - 3.37.1-2
|
|
||||||
- custom installation depend on libcanberra
|
|
||||||
|
|
||||||
* Sat Dec 04 2021 wangkerong <wangkerong@huawei.com> - 3.37.1-1
|
* Sat Dec 04 2021 wangkerong <wangkerong@huawei.com> - 3.37.1-1
|
||||||
- update to 3.37.1
|
- update to 3.37.1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user