commit: 776904179df9611267b05bc9e159b84743cd0d3f Author: osakafinance <deceiver_unbundle593 <AT> sl <DOT> projectsegfau <DOT> lt> AuthorDate: Thu Nov 6 09:00:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 10 14:33:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77690417
gnome-extra/cinnamon: fix runtime w/o networkmanager In versions 6.4.10 and 6.4.13, the build option disable_networkmanager is broken and does not work. When disable_networkmanager is set to true, the build succeeds, but it will not start with startx. In the upstream master branch, the disable_networkmanager option does not exist; instead, there is a new option called nm_agent. This has not been released as of 2025 November 6. Closes: https://bugs.gentoo.org/960231 Signed-off-by: osakafinance <deceiver_unbundle593 <AT> sl.projectsegfau.lt> Part-of: https://github.com/gentoo/gentoo/pull/44513 Closes: https://github.com/gentoo/gentoo/pull/44513 Signed-off-by: Sam James <sam <AT> gentoo.org> gnome-extra/cinnamon/cinnamon-6.4.10-r2.ebuild | 184 +++++++++++++++++++++++++ gnome-extra/cinnamon/cinnamon-6.4.13-r1.ebuild | 184 +++++++++++++++++++++++++ 2 files changed, 368 insertions(+) diff --git a/gnome-extra/cinnamon/cinnamon-6.4.10-r2.ebuild b/gnome-extra/cinnamon/cinnamon-6.4.10-r2.ebuild new file mode 100644 index 000000000000..c58ca973eb32 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-6.4.10-r2.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_REQ_USE="xml(+)" + +inherit meson gnome2-utils pax-utils python-single-r1 xdg + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"; +SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~loong ~riscv x86" +IUSE="+eds +gstreamer gtk-doc +nls wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + >=app-accessibility/at-spi2-core-2.46.0:2 + >=app-crypt/gcr-3.7.5:0/1 + >=app-crypt/libsecret-0.18 + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.82.0-r2:= + dev-libs/libxml2:2= + >=gnome-extra/cinnamon-desktop-6.4:0= + >=gnome-extra/cinnamon-menus-6.4 + >=gnome-extra/cjs-6.4[cairo(+)] + >=net-misc/networkmanager-1.10.4[introspection] + sys-apps/dbus + >=sys-auth/polkit-0.100[introspection] + virtual/opengl + x11-libs/cairo + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12.0:3[introspection,wayland?,X] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/xapp-2.8.8[introspection] + >=x11-wm/muffin-6.4[introspection,wayland?] + + eds? ( + gnome-extra/evolution-data-server + ) + gstreamer? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + ) +" +# caribou used by onscreen keyboard +# libtimezonemap used by datetime settings +# iso-flag-png (unpackaged) used by keyboard layout settings +RDEPEND=" + ${DEPEND} + >=app-accessibility/caribou-0.3 + dev-libs/keybinder:3[introspection] + dev-libs/libtimezonemap + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/python-pam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}] + ') + >=gnome-base/dconf-0.4.1 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/libgnomekbd-2.91.4 + >=gnome-extra/cinnamon-control-center-6.4[networkmanager=,wayland?] + >=gnome-extra/cinnamon-screensaver-6.4 + >=gnome-extra/cinnamon-session-6.4 + >=gnome-extra/cinnamon-settings-daemon-6.4[wayland?] + >=gnome-extra/nemo-6.4[wayland?] + media-libs/gsound + net-libs/libsoup:3.0[introspection] + net-misc/wget + sys-apps/accountsservice[introspection] + sys-apps/coreutils + sys-apps/pciutils + sys-apps/util-linux + sys-apps/xdg-desktop-portal-gtk + sys-apps/xdg-desktop-portal-xapp + sys-power/upower[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-6.4 + ) +" +BDEPEND=" + dev-lang/sassc + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gtk-doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + "${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch" + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + "${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch" + + # Use sassc instead of pysassc + # https://github.com/linuxmint/cinnamon/pull/12588 + "${FILESDIR}/${PN}-6.4.0-use-sassc.patch" +) + +src_prepare() { + default + + # shebang fixing craziness + local p + for p in $(grep -rl '#!.*python3' || die); do + python_fix_shebang "${p}" + done +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + $(meson_use wayland) + + # https://bugs.gentoo.org/960231 + -Ddisable_networkmanager=false + + -Dpy3modules_dir="$(python_get_sitedir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + python_optimize "${D}$(python_get_sitedir)" + python_optimize "${ED}"/usr/share/cinnamon/ + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}"/usr/bin/cinnamon + + # Doesn't exist by default + keepdir /etc/xdg/menus/applications-merged +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use gstreamer; then + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of Cinnamon's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "org.cinnamon.recorder/pipeline to what you want to use." + fi + else + ewarn "Cinnamon's built-in screen recording utility is not installed" + ewarn "because gstreamer support is disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/gnome-extra/cinnamon/cinnamon-6.4.13-r1.ebuild b/gnome-extra/cinnamon/cinnamon-6.4.13-r1.ebuild new file mode 100644 index 000000000000..cca4bd08ffef --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-6.4.13-r1.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +PYTHON_REQ_USE="xml(+)" + +inherit meson gnome2-utils pax-utils python-single-r1 xdg + +DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2" +HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon"; +SRC_URI="https://github.com/linuxmint/cinnamon/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD GPL-2+ GPL-3+ GPL-3-with-openssl-exception LGPL-2+ LGPL-2.1 LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+eds +gstreamer gtk-doc +nls wayland" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + >=app-accessibility/at-spi2-core-2.46.0:2 + >=app-crypt/libsecret-0.18 + >=app-crypt/gcr-3.7.5:0/1 + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.82.0-r2:= + dev-libs/libxml2:2= + >=gnome-extra/cinnamon-desktop-6.4:0= + >=gnome-extra/cinnamon-menus-6.4 + >=gnome-extra/cjs-6.4[cairo(+)] + >=net-misc/networkmanager-1.10.4[introspection] + sys-apps/dbus + >=sys-auth/polkit-0.100[introspection] + virtual/opengl + x11-libs/cairo + x11-libs/gdk-pixbuf:2[introspection] + >=x11-libs/gtk+-3.12.0:3[introspection,wayland?,X] + >=x11-libs/libnotify-0.7.3:0=[introspection] + x11-libs/libX11 + >=x11-libs/libXfixes-5.0 + x11-libs/pango[introspection] + >=x11-libs/xapp-2.8.8[introspection] + >=x11-wm/muffin-6.4[introspection,wayland?] + + eds? ( + gnome-extra/evolution-data-server + ) + gstreamer? ( + media-libs/gst-plugins-base:1.0 + media-libs/gstreamer:1.0 + ) +" +# caribou used by onscreen keyboard +# libtimezonemap used by datetime settings +# iso-flag-png (unpackaged) used by keyboard layout settings +RDEPEND=" + ${DEPEND} + >=app-accessibility/caribou-0.3 + dev-libs/keybinder:3[introspection] + dev-libs/libtimezonemap + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/distro[${PYTHON_USEDEP}] + dev-python/pexpect[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + dev-python/python-pam[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/setproctitle[${PYTHON_USEDEP}] + dev-python/tinycss2[${PYTHON_USEDEP}] + >=dev-python/python3-xapp-2.4.2[${PYTHON_USEDEP}] + ') + >=gnome-base/dconf-0.4.1 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/libgnomekbd-2.91.4 + >=gnome-extra/cinnamon-control-center-6.4[networkmanager=,wayland?] + >=gnome-extra/cinnamon-screensaver-6.4 + >=gnome-extra/cinnamon-session-6.4 + >=gnome-extra/cinnamon-settings-daemon-6.4[wayland?] + >=gnome-extra/nemo-6.4[wayland?] + media-libs/gsound + net-libs/libsoup:3.0[introspection] + net-misc/wget + sys-apps/accountsservice[introspection] + sys-apps/coreutils + sys-apps/pciutils + sys-apps/util-linux + sys-apps/xdg-desktop-portal-gtk + sys-apps/xdg-desktop-portal-xapp + sys-power/upower[introspection] + x11-misc/xdg-utils + x11-themes/adwaita-icon-theme + x11-themes/gnome-themes-standard + + nls? ( + >=gnome-extra/cinnamon-translations-6.4 + ) +" +BDEPEND=" + dev-lang/sassc + >=dev-util/intltool-0.40 + >=sys-devel/gettext-0.17 + virtual/pkgconfig + + gtk-doc? ( dev-util/gtk-doc ) +" + +PATCHES=( + # Fix backgrounds path as cinnamon doesn't provide them + # https://github.com/linuxmint/Cinnamon/issues/3575 + "${FILESDIR}/${PN}-3.8.0-gnome-background-compatibility.patch" + + # Use wheel group instead of sudo (from Fedora/Arch) + # https://github.com/linuxmint/Cinnamon/issues/3576 + "${FILESDIR}/${PN}-3.6.6-wheel-sudo.patch" + + # Use sassc instead of pysassc + # https://github.com/linuxmint/cinnamon/pull/12588 + "${FILESDIR}/${PN}-6.4.0-use-sassc.patch" +) + +src_prepare() { + default + + # shebang fixing craziness + local p + for p in $(grep -rl '#!.*python3' || die); do + python_fix_shebang "${p}" + done +} + +src_configure() { + local emesonargs=( + $(meson_use gstreamer build_recorder) + $(meson_use gtk-doc docs) + $(meson_use wayland) + + # https://bugs.gentoo.org/960231 + -Ddisable_networkmanager=false + + -Dpy3modules_dir="$(python_get_sitedir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + + python_optimize "${D}$(python_get_sitedir)" + python_optimize "${ED}"/usr/share/cinnamon/ + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}"/usr/bin/cinnamon + + # Doesn't exist by default + keepdir /etc/xdg/menus/applications-merged +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update + + if use gstreamer; then + if ! has_version 'media-libs/gst-plugins-good:1.0' || \ + ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then + ewarn "To make use of Cinnamon's built-in screen recording utility," + ewarn "you need to either install media-libs/gst-plugins-good:1.0" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" + ewarn "org.cinnamon.recorder/pipeline to what you want to use." + fi + else + ewarn "Cinnamon's built-in screen recording utility is not installed" + ewarn "because gstreamer support is disabled." + fi +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +}
