From b31d1d6a72f3d27f400fe6c0781a620780f2627e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 May 2023 05:38:21 +0100 Subject: gentoo auto-resync : 08:05:2023 - 05:38:21 --- x11-wm/muffin/Manifest | 6 +- x11-wm/muffin/files/muffin-5.6.2-clang16.patch | 18 ---- x11-wm/muffin/muffin-5.2.1.ebuild | 108 ---------------------- x11-wm/muffin/muffin-5.6.2-r1.ebuild | 121 ------------------------- x11-wm/muffin/muffin-5.6.4.ebuild | 118 ++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 251 deletions(-) delete mode 100644 x11-wm/muffin/files/muffin-5.6.2-clang16.patch delete mode 100644 x11-wm/muffin/muffin-5.2.1.ebuild delete mode 100644 x11-wm/muffin/muffin-5.6.2-r1.ebuild create mode 100644 x11-wm/muffin/muffin-5.6.4.ebuild (limited to 'x11-wm/muffin') diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest index 4db9dac1a0f5..1e5d58ffc340 100644 --- a/x11-wm/muffin/Manifest +++ b/x11-wm/muffin/Manifest @@ -1,7 +1,5 @@ -AUX muffin-5.6.2-clang16.patch 496 BLAKE2B 21e9818cd1414a5fd8d7ea919445680d2af9426bc843aed6a9812b546a88e374d865c557556930eae800b64ed1a9ee0edf7cf29f22f99df0d84f9b044b198bb0 SHA512 4238220e650fd2d7fab62dc8c528a1e2289e056364bae6b3fb14bc2bd9cf5d7fdfbc582ff6eb8b56a196a2a5df1d4b24b1a8010e5f47150c6d9a54729c4a72b4 -DIST muffin-5.2.1.tar.gz 5197177 BLAKE2B 9703a2e2c5ef75c7d4da3e201b60033a7ba549d94106df33aa9b89d0029f52c06fb4be00dd4c4d996bb083a790635a8227c8ff729dc43940f70b679e1b46924d SHA512 fa88a88f77a1cb84c2159fac8ab3ed38ae1054d3a01bb100aa264e8b91493a744da6e83ffad9190f0f7a07bd26022fea12d13a60e213d57f289685fba1810eb6 DIST muffin-5.6.2.tar.gz 4517162 BLAKE2B 95d4599f59838e1b281683ddcfb06eb152274482991ae2eea4e5c47056072df5714fc187967bdd58342ce660e3874c606de29f0e9f089d5b8511f116e703aca4 SHA512 14f71e15cedc7956f50a6b84d78ffcd1d20dba194206dd0df68147bcf60d2143eccaa1b23bf70675f4017cadd03698b6f79abedb754a04be20d73bbdbe724458 -EBUILD muffin-5.2.1.ebuild 2519 BLAKE2B 04d0035a5f5988c5367e3c423b8332524913b72b2c794deefc2de617756c4c45a3401948336e851bb46c2a2756afc0faf2f3104d961fd44870c608147b964532 SHA512 af5a8cba8a4f780a5081346e8d521f735ad461c1a473f5e0b384ed1fcf3dcf98942ae787e74292b9ca558485c2ea6b25255e8715aa9c0686accfe6d6c8b05847 -EBUILD muffin-5.6.2-r1.ebuild 3116 BLAKE2B 0a4b2351d0c0a0c0cbb107c19e1999ceeac072e1abeef1f92e28f34a8dd93adbce9ad2b83fd919b33eb3ba3a09e423d8ec3403b77d6fe3a21640ba158c5d7ed0 SHA512 f6bd529dad34b4117412ad3e7a5fdb0c3eecbd86a47d92c4a0d136a0cee8420a9ed55db388e0502f684cbff47e40d38c0bd351597f67e47fb92744b24bd0d8cb +DIST muffin-5.6.4.tar.gz 4518694 BLAKE2B 25658e858939cd6046ccfeee6fefba3f62b96555703259eb4d4706eebee43466832b161a8be7b29e360fa3cc26fb0cdceb9f10f26f79177268e61eec11ab6857 SHA512 da779f12c2a3965d0e84324bcb0d96a787d95d6b441696b595f739dfa6fd0f1ecd4f700a1a4b1d6f6842594077544f145782ddddf5961132e313962f77a4150e EBUILD muffin-5.6.2.ebuild 3060 BLAKE2B 6dae1674ad3f88f37c49431d02467ff93b887b557fdb1d0e2153bedcc4a332ce5636f80329c3f88a7bb0e0e546e167d2d9f9317263a76db9e67a28e988d89d27 SHA512 e107de86d90615c5286bcdf7321a734cec09998bd6176a891b9e8f45d78620fb70b8fc626d1a1019f6134e64e2e01c51c2e01b6d4bbee7d0a57dbd2d1ea43531 +EBUILD muffin-5.6.4.ebuild 3071 BLAKE2B 39f59f7b1591c0df79d17e7b58c6960fc59d631216120b2244e27f5593298f876cfd1eb4715605a7c29b7b3e2d530b163ecc6efca01eb0a869f6cb31045d4f0e SHA512 878554ad413b748034e2f1eda085b86aa942f1322a1ea79f982ef36bc2811c584d09edb6ca73abe1054590130dc62d73e843b86f709771747ffbb5bc549e2daa MISC metadata.xml 611 BLAKE2B 550f115a51852c3e1dfcb9f84bd84c6c24fcfa7b90ca3772ed1e7e315a7b112c035e17a34e029e794922012eee3163759fc6105af29e0dfd1767183c4779005c SHA512 3211657912916ca3a207f46159d436839e9a82594cdad574dc02c64b19654f801e082284d56c4dceddd8cdbb8be424f0b4be37b010f3130551dfe12df2928ecf diff --git a/x11-wm/muffin/files/muffin-5.6.2-clang16.patch b/x11-wm/muffin/files/muffin-5.6.2-clang16.patch deleted file mode 100644 index e2dc748071e2..000000000000 --- a/x11-wm/muffin/files/muffin-5.6.2-clang16.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/linuxmint/muffin/commit/63c7161bc0513db5727bc883269a356f64229572 - -From 63c7161bc0513db5727bc883269a356f64229572 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Wed, 1 Mar 2023 09:24:04 -0500 -Subject: [PATCH] place.c: Add missing import. - ---- a/src/core/place.c -+++ b/src/core/place.c -@@ -36,6 +36,7 @@ - #include "meta/meta-backend.h" - #include "meta/prefs.h" - #include "meta/workspace.h" -+#include "meta/meta-cursor-tracker.h" - - typedef enum - { - diff --git a/x11-wm/muffin/muffin-5.2.1.ebuild b/x11-wm/muffin/muffin-5.2.1.ebuild deleted file mode 100644 index cc08f772038b..000000000000 --- a/x11-wm/muffin/muffin-5.2.1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools gnome2-utils xdg-utils virtualx - -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" -SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-1 GPL-2+ LGPL-2+ MIT || ( MPL-1.1 GPL-2+ LGPL-2.1+ )" -SLOT="0" -IUSE="input_devices_wacom +introspection test xinerama" -KEYWORDS="amd64 ~arm64 ~riscv x86" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2[dbus] - >=dev-libs/json-glib-1.0 - >=gnome-extra/cinnamon-desktop-5.2:0= - gnome-extra/zenity - >=media-libs/libcanberra-0.26[gtk3] - media-libs/libglvnd - >=x11-libs/cairo-1.14:=[X] - x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.9.12:3[X,introspection?] - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb - >=x11-libs/libXcomposite-0.3 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - >=x11-libs/libXi-1.6.0 - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libXrender - >=x11-libs/pango-1.14.0[X,introspection?] - >=x11-libs/startup-notification-0.7:= - x11-misc/xkeyboard-config - - input_devices_wacom? ( >=dev-libs/libwacom-0.7:= ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) - xinerama? ( x11-libs/libXinerama ) -" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto - - test? ( app-text/docbook-xml-dtd:4.5 ) -" -# needs gtk-doc, not just -am, for gtk-doc.make -BDEPEND=" - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf - gnome2_disable_deprecation_warning -} - -# Wayland is not supported upstream. -src_configure() { - econf \ - --disable-gtk-doc \ - --disable-maintainer-mode \ - --disable-schemas-compile \ - --enable-compile-warnings=minimum \ - --disable-static \ - --enable-shape \ - --enable-sm \ - --enable-startup-notification \ - --enable-xsync \ - --enable-verbose-mode \ - --with-libcanberra \ - $(use_with input_devices_wacom libwacom ) \ - $(use_enable introspection) \ - $(use_enable xinerama) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die - dodoc HACKING MAINTAINERS *.txt doc/*.txt -} - -src_test() { - virtx default -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_schemas_update -} diff --git a/x11-wm/muffin/muffin-5.6.2-r1.ebuild b/x11-wm/muffin/muffin-5.6.2-r1.ebuild deleted file mode 100644 index 2b54d8cdd867..000000000000 --- a/x11-wm/muffin/muffin-5.6.2-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome2-utils meson xdg-utils virtualx - -DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" -HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" -SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0" -SLOT="0" -IUSE="input_devices_wacom +introspection screencast sysprof test udev" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" - -# Dependencies listed in meson order -COMDEPEND=" - x11-libs/libX11 - >=media-libs/graphene-1.9.3[introspection?] - >=x11-libs/gtk+-3.19.8:3[X,introspection?] - x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/pango-1.20.0[introspection?] - >=x11-libs/cairo-1.10.0:=[X] - >=dev-libs/fribidi-1.0.0 - >=dev-libs/glib-2.61.1:2 - >=dev-libs/json-glib-0.12.0[introspection?] - >=gnome-extra/cinnamon-desktop-5.6:0= - >=x11-libs/libXcomposite-0.4 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - >=x11-libs/libXfixes-3 - >=x11-libs/libXi-1.7.4 - x11-libs/libXtst - x11-libs/libxkbfile - x11-misc/xkeyboard-config - >=x11-libs/libxkbcommon-0.4.3[X] - x11-libs/libXrender - >=x11-libs/libXrandr-1.5.0 - x11-libs/libxcb:= - x11-libs/libXinerama - x11-libs/libXau - x11-libs/libICE - >=app-accessibility/at-spi2-core-2.46.0:2[introspection?] - >=media-libs/libcanberra-0.26 - sys-apps/dbus - media-libs/libglvnd[X] - media-libs/mesa[X(+),egl(+)] - x11-libs/libSM - >=x11-libs/startup-notification-0.7:= - - input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) - introspection? ( >=dev-libs/gobject-introspection-1.41.3:= ) - screencast? ( >=media-video/pipewire-0.3.0:= ) - sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 ) - udev? ( >=virtual/libudev-228:= - >=dev-libs/libgudev-232 ) -" -RDEPEND="${COMDEPEND} - gnome-extra/zenity -" -DEPEND="${COMDEPEND} - x11-base/xorg-proto - - sysprof? ( dev-util/sysprof-common ) -" -BDEPEND=" - dev-util/gdbus-codegen - dev-util/glib-utils - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.6.2-clang16.patch -) - -# Wayland is not supported upstream. -src_configure() { - local emesonargs=( - -Dopengl=true - #opengl_libname - #gles2_libname - -Dgles2=false # wayland - -Degl=true - -Dglx=true - $(meson_use screencast remote_desktop) - $(meson_use udev) - $(meson_use input_devices_wacom libwacom) - -Dpango_ft2=true - -Dstartup_notification=true - -Dsm=true - $(meson_use introspection) - $(meson_use test cogl_tests) - $(meson_use test clutter_tests) - -Dcore_tests=false # wayland - $(meson_use test tests) - $(meson_use sysprof profiler) - -Dinstalled_tests=false - #verbose - ) - - meson_src_configure -} - -src_test() { - gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed - glib-compile-schemas "${BUILD_DIR}"/data - GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_schemas_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_schemas_update -} diff --git a/x11-wm/muffin/muffin-5.6.4.ebuild b/x11-wm/muffin/muffin-5.6.4.ebuild new file mode 100644 index 000000000000..356d8ad2276a --- /dev/null +++ b/x11-wm/muffin/muffin-5.6.4.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils meson virtualx + +DESCRIPTION="Compositing window manager forked from Mutter for use with Cinnamon" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/muffin" +SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+ LGPL-2+ LGPL-2.1+ MIT SGI-B-2.0" +SLOT="0" +IUSE="input_devices_wacom +introspection screencast sysprof test udev" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +# Dependencies listed in meson order +COMDEPEND=" + x11-libs/libX11 + >=media-libs/graphene-1.9.3[introspection?] + >=x11-libs/gtk+-3.19.8:3[X,introspection?] + x11-libs/gdk-pixbuf:2[introspection?] + >=x11-libs/pango-1.20.0[introspection?] + >=x11-libs/cairo-1.10.0[X] + >=dev-libs/fribidi-1.0.0 + >=dev-libs/glib-2.61.1:2 + >=dev-libs/json-glib-0.12.0[introspection?] + >=gnome-extra/cinnamon-desktop-5.6:0= + >=x11-libs/libXcomposite-0.4 + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + >=x11-libs/libXfixes-3 + >=x11-libs/libXi-1.7.4 + x11-libs/libXtst + x11-libs/libxkbfile + x11-misc/xkeyboard-config + >=x11-libs/libxkbcommon-0.4.3[X] + x11-libs/libXrender + >=x11-libs/libXrandr-1.5.0 + x11-libs/libxcb:= + x11-libs/libXinerama + x11-libs/libXau + x11-libs/libICE + >=app-accessibility/at-spi2-core-2.46.0:2[introspection?] + >=media-libs/libcanberra-0.26 + sys-apps/dbus + media-libs/libglvnd[X] + media-libs/mesa[X(+),egl(+)] + x11-libs/libSM + >=x11-libs/startup-notification-0.7 + media-libs/fontconfig + + input_devices_wacom? ( >=dev-libs/libwacom-0.13:= ) + introspection? ( >=dev-libs/gobject-introspection-1.41.3:= ) + screencast? ( >=media-video/pipewire-0.3.0:= ) + sysprof? ( >=dev-util/sysprof-capture-3.35.2:3 ) + udev? ( >=virtual/libudev-228:= + >=dev-libs/libgudev-232 ) +" +RDEPEND="${COMDEPEND} + gnome-extra/zenity +" +DEPEND="${COMDEPEND} + x11-base/xorg-proto + + sysprof? ( dev-util/sysprof-common ) +" +BDEPEND=" + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext + virtual/pkgconfig +" + +# Wayland is not supported upstream. +src_configure() { + local emesonargs=( + -Dopengl=true + #opengl_libname + #gles2_libname + -Dgles2=false # wayland + -Degl=true + -Dglx=true + $(meson_use screencast remote_desktop) + $(meson_use udev) + $(meson_use input_devices_wacom libwacom) + -Dpango_ft2=true + -Dstartup_notification=true + -Dsm=true + $(meson_use introspection) + $(meson_use test cogl_tests) + $(meson_use test clutter_tests) + -Dcore_tests=false # wayland + $(meson_use test tests) + $(meson_use sysprof profiler) + -Dinstalled_tests=false + #verbose + ) + + meson_src_configure +} + +src_test() { + gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed + glib-compile-schemas "${BUILD_DIR}"/data + GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data virtx meson_src_test --no-suite flaky +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_schemas_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_schemas_update +} -- cgit v1.2.3