diff --git a/common/shlibs b/common/shlibs index 3be4fc446e7..dd6d231591f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2858,14 +2858,11 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-2.so.0 mutter-3.28.0_1 -libmutter-clutter-1.so mutter-3.28.0_1 -libmutter-cogl-path-1.so mutter-3.28.0_1 -libmutter-cogl-1.so mutter-3.28.0_1 -libmutter-cogl-pango-1.so mutter-3.28.0_1 -libmutter-clutter-2.so mutter-3.28.0_1 -libmutter-cogl-2.so mutter-3.28.0_1 -libmutter-cogl-pango-2.so mutter-3.28.0_1 +libmutter-3.so.0 mutter-3.30.0_1 +libmutter-clutter-3.so mutter-3.30.0_1 +libmutter-cogl-path-3.so mutter-3.30.0_1 +libmutter-cogl-3.so mutter-3.30.0_1 +libmutter-cogl-pango-3.so mutter-3.30.0_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.4 slop-7.4_1 diff --git a/srcpkgs/mutter/patches/fix-const-free.patch b/srcpkgs/mutter/patches/fix-const-free.patch deleted file mode 100644 index e2c6fd340d0..00000000000 --- a/srcpkgs/mutter/patches/fix-const-free.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wayland/meta-wayland-private.h.orig 2018-09-10 15:55:23.827732103 +0200 -+++ src/wayland/meta-wayland-private.h 2018-09-10 15:55:28.617736515 +0200 -@@ -64,7 +64,7 @@ typedef struct - struct _MetaWaylandCompositor - { - struct wl_display *wayland_display; -- const char *display_name; -+ char *display_name; - GHashTable *outputs; - struct wl_list frame_callbacks; - diff --git a/srcpkgs/mutter/patches/fix-type-mismatch.patch b/srcpkgs/mutter/patches/fix-type-mismatch.patch deleted file mode 100644 index 63e463a405d..00000000000 --- a/srcpkgs/mutter/patches/fix-type-mismatch.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff --git a/clutter/clutter/evdev/clutter-seat-evdev.c b/clutter/clutter/evdev/clutter-seat-evdev.c -index a453b1150..9bfb75af3 100644 ---- ./clutter/clutter/evdev/clutter-seat-evdev.c -+++ ./clutter/clutter/evdev/clutter-seat-evdev.c -@@ -142,7 +142,7 @@ clutter_seat_evdev_release_touch_state (ClutterSeatEvdev *seat, - ClutterTouchState *touch_state) - { - g_clear_pointer (&seat->touch_states[touch_state->seat_slot], -- (GDestroyNotify) clutter_touch_state_free); -+ clutter_touch_state_free); - } - - ClutterSeatEvdev * -diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c -index 457c0589e..ba7de3d84 100644 ---- ./src/backends/meta-screen-cast-stream-src.c -+++ ./src/backends/meta-screen-cast-stream-src.c -@@ -578,9 +578,9 @@ meta_screen_cast_stream_src_finalize (GObject *object) - if (meta_screen_cast_stream_src_is_enabled (src)) - meta_screen_cast_stream_src_disable (src); - -- g_clear_pointer (&priv->pipewire_stream, (GDestroyNotify) pw_stream_destroy); -- g_clear_pointer (&priv->pipewire_remote, (GDestroyNotify) pw_remote_destroy); -- g_clear_pointer (&priv->pipewire_core, (GDestroyNotify) pw_core_destroy); -+ g_clear_pointer (&priv->pipewire_stream, pw_stream_destroy); -+ g_clear_pointer (&priv->pipewire_remote, pw_remote_destroy); -+ g_clear_pointer (&priv->pipewire_core, pw_core_destroy); - g_source_destroy (&priv->pipewire_source->base); - - G_OBJECT_CLASS (meta_screen_cast_stream_src_parent_class)->finalize (object); -diff --git a/src/backends/native/meta-cursor-renderer-native.c b/src/backends/native/meta-cursor-renderer-native.c -index c7326af42..605b80c12 100644 ---- ./src/backends/native/meta-cursor-renderer-native.c -+++ ./src/backends/native/meta-cursor-renderer-native.c -@@ -679,7 +679,7 @@ cursor_gpu_state_free (MetaCursorNativeGpuState *cursor_gpu_state) - int i; - - for (i = 0; i < HW_CURSOR_BUFFER_COUNT; i++) -- g_clear_pointer (&cursor_gpu_state->bos[i], (GDestroyNotify) gbm_bo_destroy); -+ g_clear_pointer (&cursor_gpu_state->bos[i], gbm_bo_destroy); - g_free (cursor_gpu_state); - } - -@@ -823,7 +823,7 @@ invalidate_pending_cursor_sprite_gbm_bo (MetaCursorSprite *cursor_sprite, - - pending_bo = get_pending_cursor_sprite_gbm_bo_index (cursor_gpu_state); - g_clear_pointer (&cursor_gpu_state->bos[pending_bo], -- (GDestroyNotify) gbm_bo_destroy); -+ gbm_bo_destroy); - cursor_gpu_state->pending_bo_state = META_CURSOR_GBM_BO_STATE_INVALIDATED; - } - -diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c -index 197a62c0f..de0efb002 100644 ---- ./src/compositor/meta-background-actor.c -+++ ./src/compositor/meta-background-actor.c -@@ -183,7 +183,7 @@ set_clip_region (MetaBackgroundActor *self, - { - MetaBackgroundActorPrivate *priv = self->priv; - -- g_clear_pointer (&priv->clip_region, (GDestroyNotify) cairo_region_destroy); -+ g_clear_pointer (&priv->clip_region, cairo_region_destroy); - if (clip_region) - priv->clip_region = cairo_region_copy (clip_region); - } -diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c -index 98346c6ae..e0f8467be 100644 ---- ./src/compositor/meta-shaped-texture.c -+++ ./src/compositor/meta-shaped-texture.c -@@ -142,7 +142,7 @@ set_unobscured_region (MetaShapedTexture *self, - { - MetaShapedTexturePrivate *priv = self->priv; - -- g_clear_pointer (&priv->unobscured_region, (GDestroyNotify) cairo_region_destroy); -+ g_clear_pointer (&priv->unobscured_region, cairo_region_destroy); - if (unobscured_region) - { - guint width, height; -@@ -170,7 +170,7 @@ set_clip_region (MetaShapedTexture *self, - { - MetaShapedTexturePrivate *priv = self->priv; - -- g_clear_pointer (&priv->clip_region, (GDestroyNotify) cairo_region_destroy); -+ g_clear_pointer (&priv->clip_region, cairo_region_destroy); - if (clip_region) - priv->clip_region = cairo_region_copy (clip_region); - } -diff --git a/src/wayland/meta-wayland-touch.c b/src/wayland/meta-wayland-touch.c -index 55b772588..20088257c 100644 ---- ./src/wayland/meta-wayland-touch.c -+++ ./src/wayland/meta-wayland-touch.c -@@ -549,8 +549,8 @@ meta_wayland_touch_disable (MetaWaylandTouch *touch) - - meta_wayland_touch_cancel (touch); - -- g_clear_pointer (&touch->touch_surfaces, (GDestroyNotify) g_hash_table_unref); -- g_clear_pointer (&touch->touches, (GDestroyNotify) g_hash_table_unref); -+ g_clear_pointer (&touch->touch_surfaces, g_hash_table_unref); -+ g_clear_pointer (&touch->touches, g_hash_table_unref); - } - - void -diff --git a/src/wayland/meta-xwayland-selection.c b/src/wayland/meta-xwayland-selection.c -index f629a1302..470c7a3eb 100644 ---- ./src/wayland/meta-xwayland-selection.c -+++ ./src/wayland/meta-xwayland-selection.c -@@ -484,7 +484,7 @@ x11_selection_data_finish (MetaSelectionBridge *selection, - x11_selection_data_send_finished (selection, success); - - g_clear_pointer (&selection->x11_selection, -- (GDestroyNotify) x11_selection_data_free); -+ x11_selection_data_free); - } - - static void -@@ -706,7 +706,7 @@ wayland_data_read_cb (GObject *object, - { - reply_selection_request (&data->request_event, FALSE); - g_clear_pointer (&selection->wayland_selection, -- (GDestroyNotify) wayland_selection_data_free); -+ wayland_selection_data_free); - } - - return; -@@ -752,7 +752,7 @@ wayland_data_read_cb (GObject *object, - } - - g_clear_pointer (&selection->wayland_selection, -- (GDestroyNotify) wayland_selection_data_free); -+ wayland_selection_data_free); - } - } - -@@ -867,7 +867,7 @@ meta_x11_source_cancel (MetaWaylandDataSource *source) - - x11_selection_data_send_finished (selection, FALSE); - g_clear_pointer (&selection->x11_selection, -- (GDestroyNotify) x11_selection_data_free); -+ x11_selection_data_free); - } - - static void -@@ -1155,7 +1155,7 @@ meta_xwayland_selection_handle_selection_notify (MetaWaylandCompositor *composit - if (event->property == None) - { - g_clear_pointer (&selection->x11_selection, -- (GDestroyNotify) x11_selection_data_free); -+ x11_selection_data_free); - return FALSE; - } - -@@ -1293,7 +1293,7 @@ meta_xwayland_selection_handle_selection_request (MetaWaylandCompositor *composi - return FALSE; - - g_clear_pointer (&selection->wayland_selection, -- (GDestroyNotify) wayland_selection_data_free); -+ wayland_selection_data_free); - - if (event->target == gdk_x11_get_xatom_by_name ("TARGETS")) - { -@@ -1608,7 +1608,7 @@ meta_xwayland_selection_handle_xfixes_selection_notify (MetaWaylandCompositor *c - } - - g_clear_pointer (&selection->x11_selection, -- (GDestroyNotify) x11_selection_data_free); -+ x11_selection_data_free); - - XConvertSelection (xdisplay, - event->selection, -@@ -1747,9 +1747,9 @@ shutdown_selection_bridge (MetaSelectionBridge *selection) - XDestroyWindow (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), - selection->window); - g_clear_pointer (&selection->wayland_selection, -- (GDestroyNotify) wayland_selection_data_free); -+ wayland_selection_data_free); - g_clear_pointer (&selection->x11_selection, -- (GDestroyNotify) x11_selection_data_free); -+ x11_selection_data_free); - } - - void diff --git a/srcpkgs/mutter/patches/remove-Werror.patch b/srcpkgs/mutter/patches/remove-Werror.patch new file mode 100644 index 00000000000..dd80b5cc711 --- /dev/null +++ b/srcpkgs/mutter/patches/remove-Werror.patch @@ -0,0 +1,11 @@ +--- configure ++++ configure +@@ -18616,7 +18616,7 @@ if test "$enable_compile_warnings" != no ; then + if test "$enable_compile_warnings" = error; then + case " $CFLAGS " in + *[\ \ ]-Werror[\ \ ]*) ;; +- *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;; ++ *) CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ;; + esac + fi + fi diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index b2c8e8d3687..becc91b8960 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,26 +1,24 @@ # Template file for 'mutter' pkgname=mutter -reverts="3.30.0_1 3.30.0_2" -version=3.28.3 -revision=3 +version=3.30.0 +revision=1 build_style=gnu-configure -configure_args="--disable-schemas-compile --disable-static --enable-egl-device" +configure_args="--disable-schemas-compile --disable-static --enable-egl-device + --enable-remote-desktop" hostmakedepends="glib-devel gobject-introspection pkg-config zenity" makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel - libSM-devel libXtst-devel libcanberra-devel libinput-devel - startup-notification-devel upower-devel" + libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel + MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols" depends="desktop-file-utils zenity" short_desc="Lightweight GTK+3 window manager" maintainer="Enno Boland " -homepage="http://www.gnome.org" +homepage="https://wiki.gnome.org/Projects/Mutter/" license="GPL-2.0-or-later" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8904236269295cd62c24cd1d7b64e1d0688fffe4c7386d620dcb342070cd036f -shlib_provides="libmutter-clutter-2.so libmutter-cogl-2.so libmutter-cogl-pango-2.so" +checksum=994a795bb9356e1ffaf3649a61a566a341367a4ddd1405dc851606009c9591c1 +shlib_provides="libmutter-clutter-3.so libmutter-cogl-3.so libmutter-cogl-pango-3.so" nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio -CFLAGS+=' -Wno-error=sign-compare -Wno-error=format' - # Package build options build_options="gir" # Disable gir for cross builds. @@ -28,16 +26,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -pre_configure() { - local _arch=x86 - for i in /usr/src/kernel-headers-*/include; do - CFLAGS+=" -I$i -I$i/uapi -I$i/../arch/$_arch/include" - done - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool - #sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool -} - mutter-devel_package() { depends="gsettings-desktop-schemas>=3.16 gtk+3-devel>=3.16 clutter-devel>=1.22 libX11-devel mutter>=${version}_${revision}"