diff --git a/.checkpackageignore b/.checkpackageignore index 23b7e734d9..050994c2d2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -731,9 +731,6 @@ package/mesa3d-demos/0001-demos-makes-opengl-an-optional-component.patch lib_pat package/meson-tools/0001-amlbootenc-gxl-remove-non-std-C-convention-in-for.patch lib_patch.Upstream package/meson/0001-Prefer-ext-static-libs-when-default-library-static.patch lib_patch.Upstream package/meson/0002-mesonbuild-dependencies-base.py-add-pkg_config_stati.patch lib_patch.Upstream -package/metacity/0001-add-libm-reference.patch lib_patch.Upstream -package/metacity/0002-gconf.patch lib_patch.Upstream -package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 1c14463aae..6abd11924c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.11" +config BR2_PACKAGE_METACITY + bool "metacity has been removed" + select BR2_LEGACY + help + The metacity package has been removed, as libgtk2 has been + removed as well. + config BR2_PACKAGE_LIBSEXY bool "libsexy has been removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index a1aa1273da..e039a181eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -426,7 +426,6 @@ comment "X window managers" source "package/evilwm/Config.in" source "package/fluxbox/Config.in" source "package/matchbox/Config.in" - source "package/metacity/Config.in" source "package/openbox/Config.in" source "package/ratpoison/Config.in" endmenu diff --git a/package/metacity/0001-add-libm-reference.patch b/package/metacity/0001-add-libm-reference.patch deleted file mode 100644 index 628501726a..0000000000 --- a/package/metacity/0001-add-libm-reference.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream fix to link metacity itself against libm - -The upstream fix is modified to also include the changes on the -configure script directly, so that autoreconfiguring is not -needed. Autoreconfiguring cannot be done easily on metacity, due to -missing AM_GCONF_SOURCE_2 and AM_NLS macros. - -http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc - -Signed-off-by: Thomas Petazzoni - -From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001 -From: Götz Waschk -Date: Wed, 22 Oct 2008 12:08:48 +0000 -Subject: add libm reference. Closes #557357. - -2008-10-22 Götz Waschk - - * configure.in: add libm reference. Closes #557357. - - -svn path=/trunk/; revision=3984 ---- -(limited to 'configure.in') - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -413,7 +413,7 @@ - AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library]) - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -29509,7 +29509,7 @@ - - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" diff --git a/package/metacity/0002-gconf.patch b/package/metacity/0002-gconf.patch deleted file mode 100644 index 939ef7ef98..0000000000 --- a/package/metacity/0002-gconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] fix build with --disable-gconf - -src/core/prefs.c still contain a call to gconf_client_set_bool() when -built with --disable-gconf, breaking the build. - -Signed-off-by: Peter Korsgaard ---- - src/core/prefs.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: metacity-2.25.1/src/core/prefs.c -=================================================================== ---- metacity-2.25.1.orig/src/core/prefs.c -+++ metacity-2.25.1/src/core/prefs.c -@@ -2949,6 +2949,7 @@ - void - meta_prefs_set_compositing_manager (gboolean whether) - { -+#if HAVE_GCONF - GError *err = NULL; - - gconf_client_set_bool (default_client, -@@ -2962,6 +2963,7 @@ - err->message); - g_error_free (err); - } -+#endif - } - - #ifndef HAVE_GCONF diff --git a/package/metacity/0003-mag-add-libm-reference.patch b/package/metacity/0003-mag-add-libm-reference.patch deleted file mode 100644 index d47d807558..0000000000 --- a/package/metacity/0003-mag-add-libm-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream patch to fix link against libm - -The upstream patch is modified to also include the necessary -Makefile.in, which avoids the need for autoreconfiguring the -package. Autoreconfiguring the package unfortunately doesn't work, due -to AM_GCONF_SOURCE_2 and AM_NLS macros being missing. - -http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b - -Signed-off-by: Thomas Petazzoni - -From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 02 May 2010 14:50:42 +0000 -Subject: fails to link with pedantic linkers - ---- -(limited to 'src/tools/Makefile.am') - -Index: b/src/tools/Makefile.am -=================================================================== ---- a/src/tools/Makefile.am -+++ b/src/tools/Makefile.am -@@ -26,7 +26,7 @@ - - metacity_message_LDADD= @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - - EXTRA_DIST=$(icon_DATA) -Index: b/src/tools/Makefile.in -=================================================================== ---- a/src/tools/Makefile.in -+++ b/src/tools/Makefile.in -@@ -281,7 +281,7 @@ - - metacity_message_LDADD = @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - EXTRA_DIST = $(icon_DATA) - all: all-am diff --git a/package/metacity/Config.in b/package/metacity/Config.in deleted file mode 100644 index fc106a26b9..0000000000 --- a/package/metacity/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_METACITY - bool "metacity" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - # Metacity configure.ac pretends it can be built without - # Composite, but in reality, it doesn't build. - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXDAMAGE - # We do not directly depend on Xft, but they are needed to get - # Xft support in Pango, which we require. - select BR2_PACKAGE_XLIB_LIBXFT - help - Metacity is a window manager for the X Window System. - - https://wiki.gnome.org/Projects/Metacity diff --git a/package/metacity/Xsession b/package/metacity/Xsession deleted file mode 100755 index 7225921a07..0000000000 --- a/package/metacity/Xsession +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export GDK_USE_XFT=1 -export LANG="en_US.UTF-8" -export LC_ALL="en_US.UTF-8" -/usr/bin/X11/rxvt -bg black -fg gray90 & -exec /bin/metacity diff --git a/package/metacity/metacity.hash b/package/metacity/metacity.hash deleted file mode 100644 index 2aca099038..0000000000 --- a/package/metacity/metacity.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://download.gnome.org/sources/metacity/2.25/metacity-2.25.1.sha256sum -sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 - -# Locally computed -sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/metacity/metacity.mk b/package/metacity/metacity.mk deleted file mode 100644 index 5756658300..0000000000 --- a/package/metacity/metacity.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# metacity -# -################################################################################ - -# newer versions need libcanberra-gtk and gnome-doc-utils -METACITY_VERSION_MAJOR = 2.25 -METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 -METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = https://download.gnome.org/sources/metacity/$(METACITY_VERSION_MAJOR) -METACITY_LICENSE = GPL-2.0+ -METACITY_LICENSE_FILES = COPYING - -METACITY_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --disable-gconf \ - --disable-sm \ - --disable-startup-notification - -METACITY_DEPENDENCIES = libgtk2 \ - xlib_libX11 \ - host-libxml-parser-perl \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXrender \ - xlib_libXdamage \ - $(TARGET_NLS_DEPENDENCIES) - -METACITY_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -METACITY_DEPENDENCIES += xlib_libXcursor -endif - -define METACITY_INSTALL_XSESSION - $(INSTALL) -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession -endef - -METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION - -$(eval $(autotools-package))