diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-09-21 12:11:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-21 12:11:53 +0100 |
commit | 1fd1215c62ee14dc2e94fa04d6e3622391c9ab57 (patch) | |
tree | 909630a900b1ac6b180d8af2e2345a171417d59f /mate-base | |
parent | d60aa36cd97fb2193f756b45820d7c073a49229d (diff) |
gentoo auto-resync : 21:09:2024 - 12:11:53
Diffstat (limited to 'mate-base')
-rw-r--r-- | mate-base/Manifest.gz | bin | 2239 -> 2239 bytes | |||
-rw-r--r-- | mate-base/mate-control-center/Manifest | 1 | ||||
-rw-r--r-- | mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch | 435 | ||||
-rw-r--r-- | mate-base/mate-settings-daemon/Manifest | 1 | ||||
-rw-r--r-- | mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch | 45 |
5 files changed, 0 insertions, 482 deletions
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz Binary files differindex 429d23a48fba..eaef7e0ef279 100644 --- a/mate-base/Manifest.gz +++ b/mate-base/Manifest.gz diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest index 4d159d1b382e..bdca2341d31c 100644 --- a/mate-base/mate-control-center/Manifest +++ b/mate-base/mate-control-center/Manifest @@ -1,4 +1,3 @@ -AUX mate-control-center-1.26.0-ayatana-detection.patch 13594 BLAKE2B 57a8711bebc864a8b315ec2b6c66de36cddddd4302ce2ca07b8a6136c401ece9ac99efe3608656c1ce61730bb65829f10d52ff22f19a1ee32a3f6b15b458faf1 SHA512 0cf3a80780e072c61f3cc5815d4f0a40958972d4f507209c2824b377ae1e6b4b77fa2aac1b894740d2fb836412173156afda917e0afede6cc2c54a4d9019cd44 AUX mate-control-center-1.28.0-optional-systemd.patch 9881 BLAKE2B bb297f261099f0c412f6329e4da4f0a906c1483d6a9bbb24f2efa8c3a6208df1759494a5abce1339137ef4abf412416352394e89a886d9fa36cf049941a97726 SHA512 17f25fd8d829a78f30fe2507bf9c589089a3dc4c4065995862f5f02ce112137b763e0c94669ef69d56ac51c2b4b6f28feb65816a04484c23abc18d9d0bf8ed7b DIST mate-control-center-1.28.0.tar.xz 3540504 BLAKE2B 285f96a320944fc659af6922224375cb910cad0d8646a0785d2d769d02347de505fa4ef8d1359956452aae861b7dc5e5361e3f1db3e28eab961dbbb3e083d1c6 SHA512 6047ecf466d6168bbd040dc0315ce6ffadc189a95cc794dbe521845fa4b7889506ea46246fbbd19ecb293b036b10190ab584dc2dc97653388b1367b65b29ed74 EBUILD mate-control-center-1.28.0.ebuild 1601 BLAKE2B 1a98605c41d395c3a5f5a47534152824b7fb74f46da6ee42ae6abb8c88bf605dc9e70b10901fd43f78759b2d67f799f35fc0f5bb71b3032b3ecf90d2aad96cc6 SHA512 e4dc4d65c3a325ce938620dbeb11df5f4d1d06c2cea6e3547328259600dbf96e016a25d951ab4c9388b65c0f0380f877c7ab4426261970fa627a15e4f29d937b diff --git a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch b/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch deleted file mode 100644 index ed1c8aec619e..000000000000 --- a/mate-base/mate-control-center/files/mate-control-center-1.26.0-ayatana-detection.patch +++ /dev/null @@ -1,435 +0,0 @@ ---- mate-control-center-1.26.0.old/configure.ac 2023-04-28 16:12:05.281295458 +0200 -+++ mate-control-center-1.26.0/configure.ac 2023-04-28 16:48:44.374329792 +0200 -@@ -84,30 +84,50 @@ - - AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break) - --dnl app indicator --APPINDICATOR_PKG=appindicator3-0.1 -+dnl app indicator (Ubuntu and Ayatana implementation) -+AYATANA_APPINDICATOR_PKG=ayatana-appindicator3-0.1 -+UBUNTU_APPINDICATOR_PKG=appindicator3-0.1 -+ -+PKG_CHECK_EXISTS($AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, -+ [have_appindicator_ayatana="yes"], -+ [have_appindicator_ayatana="no"]) -+PKG_CHECK_EXISTS($UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED, -+ [have_appindicator_ubuntu="yes"], -+ [have_appindicator_ubuntu="no"]) - - AC_ARG_ENABLE(appindicator, - AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]), - [enable_appindicator=$enableval], - [enable_appindicator="auto"]) - --if test x$enable_appindicator = xauto ; then -- PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -- enable_appindicator="yes", -- enable_appindicator="no") -+if test "x$enable_appindicator" = "xauto" && -+ (test "x$have_appindicator_ayatana" = "xyes" || -+ test "x$have_appindicator_ubuntu" = "xyes"); then -+ AC_MSG_NOTICE([Enabling AppIndicator support (as --enable-appindicator=auto was used).]) -+ enable_appindicator="yes" - fi - --if test x$enable_appindicator = xyes ; then -- PKG_CHECK_EXISTS([$APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED],, -- AC_MSG_ERROR([appindicator-0.1 is not installed])) -- PKG_CHECK_MODULES(APP_INDICATOR, -- $APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED) -- AC_SUBST(APP_INDICATOR_CFLAGS) -- AC_SUBST(APP_INDICATOR_LIBS) -- AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) -+if test "x$enable_appindicator" = "xyes"; then -+ if test "x$have_appindicator_ayatana" = "xyes"; then -+ AC_MSG_NOTICE([Buidling against Ayatana AppIndicator.]) -+ PKG_CHECK_MODULES(AYATANA_APPINDICATOR, -+ [$AYATANA_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -+ [AC_DEFINE(HAVE_AYATANA_APPINDICATOR, 1, [Have Ayatana AppIndicator])]) -+ AC_SUBST(AYATANA_APPINDICATOR_CFLAGS) -+ AC_SUBST(AYATANA_APPINDICATOR_LIBS) -+ elif test "x$have_appindicator_ubuntu" = "xyes"; then -+ AC_MSG_NOTICE([Buidling against Ubuntu AppIndicator.]) -+ PKG_CHECK_MODULES(UBUNTU_APPINDICATOR, -+ [$UBUNTU_APPINDICATOR_PKG >= $APPINDICATOR_REQUIRED], -+ [AC_DEFINE(HAVE_UBUNTU_APPINDICATOR, 1, [Have Ubuntu AppIndicator])]) -+ AC_SUBST(UBUNTU_APPINDICATOR_CFLAGS) -+ AC_SUBST(UBUNTU_APPINDICATOR_LIBS) -+ else -+ AC_MSG_ERROR([Neither Ayatana AppIndicator nor Ubuntu AppIndicator library is present, but you enabled AppIndicator support.]) -+ fi - fi --AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) -+AM_CONDITIONAL(HAVE_AYATANA_APPINDICATOR, test x"$have_appindicator_ayatana" = xyes -a x"$enable_appindicator" = xyes) -+AM_CONDITIONAL(HAVE_UBUNTU_APPINDICATOR, test x"$have_appindicator_ubuntu" = xyes -a x"$enable_appindicator" = xyes) - - dnl keyboard-properties-capplet - savecppflags=$CPPFLAGS -@@ -322,7 +342,10 @@ - Warning flags: ${WARN_CFLAGS} - Linker flags: ${LDFLAGS} - -- Appindicator: ${enable_appindicator} -+ AppIndicator enabled: ${enable_appindicator} -+ Ayatana AppIndicator (preferred) ${have_appindicator_ayatana} -+ Ubuntu AppIndicator (legacy) ${have_appindicator_ubuntu} -+ - Libmate-slab: ${have_libmateslab} - Accountsservice: ${have_accountsservice} - Native Language support: ${USE_NLS} ---- mate-control-center-1.26.0.old/typing-break/drwright.c 2023-04-28 16:12:05.282295452 +0200 -+++ mate-control-center-1.26.0/typing-break/drwright.c 2023-04-28 16:27:03.082651572 +0200 -@@ -30,9 +30,11 @@ - #include <gtk/gtk.h> - #include <gio/gio.h> - --#ifdef HAVE_APP_INDICATOR --#include <libappindicator/app-indicator.h> --#endif /* HAVE_APP_INDICATOR */ -+#if defined(HAVE_AYATANA_APPINDICATOR) -+# include <libayatana-appindicator/app-indicator.h> -+#elif defined(HAVE_UBUNTU_APPINDICATOR) -+# include <libappindicator/app-indicator.h> -+#endif - - #define MATE_DESKTOP_USE_UNSTABLE_API - #include <libmate-desktop/mate-desktop-utils.h> -@@ -43,11 +45,11 @@ - #include "drw-utils.h" - #include "drw-timer.h" - --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - #define BLINK_TIMEOUT 200 - #define BLINK_TIMEOUT_MIN 120 - #define BLINK_TIMEOUT_FACTOR 100 --#endif /* HAVE_APP_INDICATOR */ -+#endif - - typedef enum { - STATE_START, -@@ -59,10 +61,10 @@ - STATE_BREAK_DONE - } DrwState; - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - #define TYPING_MONITOR_ACTIVE_ICON "bar-green" - #define TYPING_MONITOR_ATTENTION_ICON "bar-red" --#endif /* HAVE_APP_INDICATOR */ -+#endif - - struct _DrWright { - /* Widgets. */ -@@ -88,7 +90,7 @@ - gboolean enabled; - - guint clock_timeout_id; --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - AppIndicator *indicator; - #else - guint blink_timeout_id; -@@ -102,7 +104,7 @@ - cairo_surface_t *green_bar; - cairo_surface_t *disabled_bar; - GdkPixbuf *composite_bar; --#endif /* HAVE_APP_INDICATOR */ -+#endif - - GtkWidget *warn_dialog; - }; -@@ -124,11 +126,11 @@ - DrWright *dr); - static void popup_about_cb (GtkAction *action, - DrWright *dr); --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - static void init_app_indicator (DrWright *dr); - #else - static void init_tray_icon (DrWright *dr); --#endif /* HAVE_APP_INDICATOR */ -+#endif - static GList * create_secondary_break_windows (void); - - static const GtkActionEntry actions[] = { -@@ -147,7 +149,7 @@ - dr->break_time = 10; - } - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - static void - update_app_indicator (DrWright *dr) - { -@@ -304,32 +306,32 @@ - - return FALSE; - } --#endif /* HAVE_APP_INDICATOR */ -+#endif - - static void - start_blinking (DrWright *dr) - { --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - if (!dr->blink_timeout_id) { - dr->blink_on = TRUE; - blink_timeout_cb (dr); - } - - /*gtk_widget_show (GTK_WIDGET (dr->icon));*/ --#endif /* HAVE_APP_INDICATOR */ -+#endif - } - - static void - stop_blinking (DrWright *dr) - { --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - if (dr->blink_timeout_id) { - g_source_remove (dr->blink_timeout_id); - dr->blink_timeout_id = 0; - } - - /*gtk_widget_hide (GTK_WIDGET (dr->icon));*/ --#endif /* HAVE_APP_INDICATOR */ -+#endif - } - - static gboolean -@@ -397,9 +399,9 @@ - dr->break_window = NULL; - } - --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - set_status_icon (dr->icon, dr->neutral_bar); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - dr->save_last_time = 0; - -@@ -437,9 +439,9 @@ - } - - stop_blinking (dr); --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - set_status_icon (dr->icon, dr->red_bar); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - drw_timer_start (dr->timer); - -@@ -480,9 +482,9 @@ - - case STATE_BREAK_DONE_SETUP: - stop_blinking (dr); --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - set_status_icon (dr->icon, dr->green_bar); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - dr->state = STATE_BREAK_DONE; - break; -@@ -498,11 +500,11 @@ - - dr->last_elapsed_time = elapsed_time; - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - update_app_indicator (dr); - #else - update_icon (dr); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - return TRUE; - } -@@ -512,45 +514,45 @@ - { - gint min; - gchar *str; --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - GtkWidget *item; --#endif /* HAVE_APP_INDICATOR */ -+#endif - - if (!dr->enabled) { --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - app_indicator_set_status (dr->indicator, - APP_INDICATOR_STATUS_PASSIVE); - #else - gtk_status_icon_set_tooltip_text (dr->icon, - _("Disabled")); --#endif /* HAVE_APP_INDICATOR */ -+#endif - return TRUE; - } - - min = get_time_left (dr); - - if (min >= 1) { --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - str = g_strdup_printf (_("Take a break now (next in %dm)"), min); - #else - str = g_strdup_printf (ngettext("%d minute until the next break", - "%d minutes until the next break", - min), min); --#endif /* HAVE_APP_INDICATOR */ -+#endif - } else { --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - str = g_strdup_printf (_("Take a break now (next in less than one minute)")); - #else - str = g_strdup_printf (_("Less than one minute until the next break")); --#endif /* HAVE_APP_INDICATOR */ -+#endif - } - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - item = gtk_ui_manager_get_widget (dr->ui_manager, "/Pop/TakeABreak"); - gtk_menu_item_set_label (GTK_MENU_ITEM (item), str); - #else - gtk_status_icon_set_tooltip_text (dr->icon, str); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - g_free (str); - -@@ -665,7 +667,7 @@ - NULL); - } - --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - static void - popup_menu_cb (GtkWidget *widget, - guint button, -@@ -684,7 +686,7 @@ - 0, - gtk_get_current_event_time ()); - } --#endif /* HAVE_APP_INDICATOR */ -+#endif - - static void - break_window_done_cb (GtkWidget *window, -@@ -724,11 +726,11 @@ - drw_timer_start (dr->timer); - maybe_change_state (dr); - update_status (dr); --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - update_app_indicator (dr); - #else - update_icon (dr); --#endif /* HAVE_APP_INDICATOR */ -+#endif - } - - static void -@@ -745,7 +747,7 @@ - dr->secondary_break_windows = NULL; - } - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - static void - init_app_indicator (DrWright *dr) - { -@@ -792,7 +794,7 @@ - G_CALLBACK (popup_menu_cb), - dr); - } --#endif /* HAVE_APP_INDICATOR */ -+#endif - - static GList * - create_secondary_break_windows (void) -@@ -891,7 +893,7 @@ - G_CALLBACK (activity_detected_cb), - dr); - --#ifdef HAVE_APP_INDICATOR -+#if defined(HAVE_AYATANA_APPINDICATOR) || defined(HAVE_UBUNTU_APPINDICATOR) - init_app_indicator (dr); - #else - dr->neutral_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar.png"); -@@ -900,7 +902,7 @@ - dr->disabled_bar = cairo_image_surface_create_from_png (IMAGEDIR "/bar-disabled.png"); - - init_tray_icon (dr); --#endif /* HAVE_APP_INDICATOR */ -+#endif - - g_timeout_add_seconds (12, - (GSourceFunc) update_status, ---- mate-control-center-1.26.0.old/typing-break/Makefile.am 2023-04-28 16:12:05.283295447 +0200 -+++ mate-control-center-1.26.0/typing-break/Makefile.am 2023-04-28 16:30:45.343491923 +0200 -@@ -32,9 +32,14 @@ - mate_typing_monitor_LDADD += @LIBCANBERRA_GTK_LIBS@ - endif - --if HAVE_APP_INDICATOR -- mate_typing_monitor_CFLAGS += -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@ -- mate_typing_monitor_LDADD += @APP_INDICATOR_LIBS@ -+if HAVE_AYATANA_APPINDICATOR -+ mate_typing_monitor_CFLAGS += -DHAVE_AYATANA_APPINDICATOR @AYATANA_APPINDICATOR_CFLAGS@ -+ mate_typing_monitor_LDADD += @AYATANA_APPINDICATOR_LIBS@ -+endif -+ -+if HAVE_UBUNTU_APPINDICATOR -+ mate_typing_monitor_CFLAGS += -DHAVE_UBUNTU_APPINDICATOR @UBUNTU_APPINDICATOR_CFLAGS@ -+ mate_typing_monitor_LDADD += @UBUNTU_APPINDICATOR_LIBS@ - endif - - imagedir = $(pkgdatadir)/pixmaps ---- mate-control-center-1.26.0.old/typing-break/main.c 2023-04-28 16:12:05.282295452 +0200 -+++ mate-control-center-1.26.0/typing-break/main.c 2023-04-28 16:32:09.781067404 +0200 -@@ -31,7 +31,7 @@ - - gboolean debug = FALSE; - --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - static gboolean - have_tray (void) - { -@@ -50,7 +50,7 @@ - return FALSE; - } - } --#endif /* HAVE_APP_INDICATOR */ -+#endif - - int - main (int argc, char *argv[]) -@@ -98,7 +98,7 @@ - return 0; - } - --#ifndef HAVE_APP_INDICATOR -+#if !defined(HAVE_AYATANA_APPINDICATOR) && !defined(HAVE_UBUNTU_APPINDICATOR) - if (!no_check && !have_tray ()) { - GtkWidget *dialog; - -@@ -116,7 +116,7 @@ - - gtk_widget_destroy (dialog); - } --#endif /* HAVE_APP_INDICATOR */ -+#endif - - drwright_new (); - diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest index 0c5e94e99d34..3e2ec6fcb62c 100644 --- a/mate-base/mate-settings-daemon/Manifest +++ b/mate-base/mate-settings-daemon/Manifest @@ -1,4 +1,3 @@ -AUX mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch 1953 BLAKE2B fcd9cb4f539776b09646d094b2e924708b3e3cd9e469939d3c5a0c01a067e89a977c6f2bb87f3f8ca85dac9c04b359db2775f058f14051f821a63ea1f08119fd SHA512 b48f83a7bfa8ca5a4acfe23fecb51e0a00931a31529fe64cf3779ad275b5499c055eb747e04b73634850434a160149c2fcc3549e74d4d6cae68d40662c080b84 DIST mate-settings-daemon-1.28.0.tar.xz 1047604 BLAKE2B fab6b5ffb28039474976b1ad3f82e8096c568186df8a7f796e95ce8b7dbed72e35feee30b5f6cff14de8df4d1048d697543ec9f29e59d37171e708b8a12556c9 SHA512 1bd7bfec26538abd2ba44ff2e52e3782e3c2467e20f784d411dbcc80f1b0bb8e95f9a3075c42ac49576f3f3dd7cbe07e78984711b43d9cf856dcf6bb213535a3 EBUILD mate-settings-daemon-1.28.0.ebuild 1677 BLAKE2B 081d80d4762ebbf67cd9e62d9844f07e8442f78e09e747facea398b68ab1374b0fa3700553fb813f2fb2843a00ce9088a3b73614e886a04a1e618c88d80560e8 SHA512 3e1cec4f73d0a22b15d65d4ad5d65a3d026b28f14cb7ffb8a6ea2caca6ecee6d4beaadd26f193ffdac3e75014e77641b7ffd3df05746d130062135d1e24abbc6 MISC metadata.xml 568 BLAKE2B f9546d64af97df98a18693fc21014bcbd420d855945dd70f97c11f1a372d03d5c4eeff503b990d585010b01aa890bda069dbb4688644e47a30a71fc8d1836f7c SHA512 9fd8efc6f324103205eca4c633d462a9ca1c3daf76e517c2e4c6601ad26441a96919426c52a40a257c253b775e93228857fa879c7c5d2b0c8d1c895de16f945d diff --git a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch b/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch deleted file mode 100644 index cf91dbc6412e..000000000000 --- a/mate-base/mate-settings-daemon/files/mate-settings-daemon-1.26.0-fix-buid-with-clang16.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/mate-desktop/mate-settings-daemon/commit/42e91f2805c508317b4d26166cb3db332dd313e8.patch -From: Colomban Wendling <cwendling@hypra.fr> -Date: Tue, 27 Jun 2023 12:21:16 +0200 -Subject: [PATCH] a11y-keyboard-atspi: Fix memory leak - -Fix fairly large memory leak when beeping on keys while caps lock is -enabled. The libatspi2 docs and API were quite misleading, so I -overlooked the fact the event parameter should be freed in the -callback. - -This changes the constness of the callback argument, which is new in -libatspi2 2.40 -- yet the actual behavior didn't change, only the -qualifier was removed, see [1]. -This might however bring up a compiler warning when building against -libatspi2 < 2.40; but on the other hand it fixed build with -clang >= 16, see #399. As it is unlikely to build with clang >= 16 -and libatspi2 < 2.40, I think it's a good compromise. - -[1] https://gitlab.gnome.org/GNOME/at-spi2-core/-/commit/7dfb0b7fc2d1710ef7fad54f910fa4c6a5e3af17 ---- a/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c -+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-atspi.c -@@ -55,16 +55,16 @@ msd_a11y_keyboard_atspi_class_init (MsdA11yKeyboardAtspiClass *klass) - } - - static gboolean --on_key_press_event (const AtspiDeviceEvent *event, -- void *user_data G_GNUC_UNUSED) -+on_key_press_event (AtspiDeviceEvent *event, -+ void *user_data G_GNUC_UNUSED) - { - /* don't ring on capslock itself, that's taken care of by togglekeys - * if the user want it. */ -- if (event->id == GDK_KEY_Caps_Lock) -- return FALSE; -- -- gdk_display_beep (gdk_display_get_default ()); -+ if (event->id != GDK_KEY_Caps_Lock) -+ gdk_display_beep (gdk_display_get_default ()); - -+ /* cast the possible erroneous const away with atspi < 2.40 */ -+ g_boxed_free (ATSPI_TYPE_DEVICE_EVENT, (gpointer) event); - return FALSE; - } - - |