diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-03-11 01:49:36 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-03-11 01:49:36 +0000 |
commit | cf7807d7aea23a99a144afceaba961cfed652b5f (patch) | |
tree | ffd2c781c27e0b7e72152a685a04938a2b7966f0 /gnome-extra/cinnamon | |
parent | 7c5ebaf83da4c538dd11b56fdd5dfdf39dcbc096 (diff) |
Diffstat (limited to 'gnome-extra/cinnamon')
-rw-r--r-- | gnome-extra/cinnamon/Manifest | 3 | ||||
-rw-r--r-- | gnome-extra/cinnamon/cinnamon-6.4.8.ebuild | 183 | ||||
-rw-r--r-- | gnome-extra/cinnamon/files/cinnamon-6.4.0-use-sassc.patch | 64 |
3 files changed, 250 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest index c0f633de86ce..69df8fd1a45d 100644 --- a/gnome-extra/cinnamon/Manifest +++ b/gnome-extra/cinnamon/Manifest @@ -4,7 +4,10 @@ AUX cinnamon-6.2.0-fix-arm64-settings-panel-path.patch 1832 BLAKE2B 15f3300a695f AUX cinnamon-6.2.0-optional-wayland.patch 2333 BLAKE2B 2c52be837f95f24a20c4a4a506891bba315eefcbc7574b8024c741881d3b04c7bbebba716539d52ee960c5d2295812d81b0affc6112ae2fca0c80a845e95b4e3 SHA512 c43995dec07d4be77bc1c14c1a73d8d8d1acef9ab22479a1bd74067aed162523a21279aa7f3b45353e555708b2af9d0ea6ac39dc1150bd2b9cc1da57941f1b0c AUX cinnamon-6.2.0-polkit-agent-on-x11.patch 2440 BLAKE2B ddecfd38e2ac60ab9089e68708efae1e24e5c597c2523222e2b8be4f0f71020dc2dff7008e4c4d895fb58d345263e6176e2f097e96ed7d5c98966dc41d447a4f SHA512 e8b72d5c024a8b3b5d4b171c43f0528e2915a21d21893bb4fb4c5fe2a5e9ce6272c9da781a9282f1445b6643929e666af325c3f4d0e755e53365861b9279c078 AUX cinnamon-6.2.0-remove-gtk-doc-recorder.patch 2739 BLAKE2B e76ca1591e94198b56b1424d918e3e825fca229e5f690d5b88c57be4f4ec778b35d8a0600c7439b90b438ef1e886dcfb23347c3caea32193aec0bdfd9a5b3807 SHA512 b3bc23c47e106b5a6af25c5516b0277a55ec799e31f8fdf18987ee3979cc7f6276598939525ecbde08c64345130b371bfbe14ed3b37b1eeb7854377756ad05da +AUX cinnamon-6.4.0-use-sassc.patch 2041 BLAKE2B a0ea8a4af151cf14421a95758a9e588653d7443b4505be61f95148f16f65804d259a01e679ef51f2a2fe7145b3d9cae4bb6ede623c1429656400c6307705c224 SHA512 71658218567ddaa701a04a9f4a5fbc075ca5fb1a28db934e109ad0d1a168d11fb2a5edf7c7d3a74b8d4fdfc7f0c82326b407ce78a4430e5dbd6e854bae7189af AUX polkit-cinnamon-authentication-agent-1.desktop 252 BLAKE2B 8a7c10fa19e19c479ab40e9599b8804bc42a78548b9a09f34edc497dc5c9cbcd6958dbbb93cede57c0bf7938cc22f49c229274941b9509ad220e8790ed26bf9e SHA512 7857dc3d08129c37c461b85049d3a12b6602853d7dc44e68d79ce28bbe1121051a2061a4a4de050402230f85755d2800143e3373708fa19d43a001f7f1100360 DIST cinnamon-6.2.9.tar.gz 2547804 BLAKE2B 13a03e5f521d79f6929c16802629fb99b86d7e7f09ea65df76505b8216aa54ca37471a59ed68437bc470df34ca6b5b79e1b66df33721736e2a2c802b8a7755d8 SHA512 8226dedfa26069fd86e6e52daa5bfd46b54de58865cd98e07715caf8843ec1981b28fa2c8195ab153e127156eee6d6b6cd7e94eb715a66c206c0a7e9452fed11 +DIST cinnamon-6.4.8.tar.gz 2592689 BLAKE2B 165f4e89844af4c58d85d8341542c86891c2f7f3bd56bc1a6f6b14bd2357bb8f3884452defdd99202e5f63efb817ca3b9737d884c40ee87912b0cd82898fb1db SHA512 11e929ca17a80c9aeaf92138333a717f8702cc27669a03d4a95cb8b4154b65869ed102a91a303ce80901667a343e5ed5647a7eff216f630dcd6ff44a5101fa26 EBUILD cinnamon-6.2.9.ebuild 6154 BLAKE2B e1d1f25087647251b83f1ed438fd06073e685db4855ddb8860d1e58390324a1b470fb5780e238d405f222430caed05e46954e81d4cc26671b069a165727565a1 SHA512 e2c07e8e72d9d55e40f2e1b5f63d2cc1d094b55b1f688411d492b444b2ce8bfd3a4de2706776263fe68ad43276959b9acb95a4316858c67aca879eb8dffdf89a +EBUILD cinnamon-6.4.8.ebuild 5180 BLAKE2B 8dd8bc9418534b6cdf1d226ec8098266dddf5cb8d00c122627a4e09efd4ecd4e61e6ce9ca3aa99ecb5bf58f40469956250ba0a82069476ec490a76b3e523f497 SHA512 0ec27eda7ccf4122a24b88e42ef8f5aaea6240dcef5515e83b5f3f0ba775ba57cad8dd365885f51d13eaa93d4b7702cf6fb99a3304de6cebb79016032db05697 MISC metadata.xml 685 BLAKE2B abc17d8b8cf6c9e0886fe404030821ac588090c26477e72e4d8a0bdc7cc26b20dc130c7a7b41cd240db4c8073f05fd9947447ae517cfc2646d59aeb35c1783f6 SHA512 84b352a0ebcc832bd71733e4b9b5954bcdf2005e18d357f5d39f03d177b7be6f8477e88965c8b66119da5209071745a197f21a9d049bbed8e903f794bf110b62 diff --git a/gnome-extra/cinnamon/cinnamon-6.4.8.ebuild b/gnome-extra/cinnamon/cinnamon-6.4.8.ebuild new file mode 100644 index 000000000000..1b00a5c918d1 --- /dev/null +++ b/gnome-extra/cinnamon/cinnamon-6.4.8.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..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 +networkmanager 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 + >=dev-libs/glib-2.52.0:2[dbus] + >=dev-libs/gobject-introspection-1.29.15:= + dev-libs/libxml2:2 + >=gnome-extra/cinnamon-desktop-6.4:0= + >=gnome-extra/cinnamon-menus-6.4 + >=gnome-extra/cjs-6.4[cairo] + 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 + ) + networkmanager? ( + >=app-crypt/libsecret-0.18 + >=net-misc/networkmanager-1.10.4[introspection] + ) +" +# 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) + -Ddisable_networkmanager=$(usex networkmanager false true) + -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/files/cinnamon-6.4.0-use-sassc.patch b/gnome-extra/cinnamon/files/cinnamon-6.4.0-use-sassc.patch new file mode 100644 index 000000000000..4405268948bf --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-6.4.0-use-sassc.patch @@ -0,0 +1,64 @@ +From 9f4c3d8462479e63f17d755be020d48bb4df94b2 Mon Sep 17 00:00:00 2001 +From: Sparky Bluefang <sparky@bluefang-logic.com> +Date: Tue, 24 Dec 2024 04:18:44 -0500 +Subject: [PATCH] Move sass compilation to its own custom target so it shows up + in the build log. Support both pysassc and sassc. + +--- + data/meson.build | 3 +-- + data/theme/cinnamon-sass/meson.build | 11 +++++++++++ + data/theme/meson.build | 4 +--- + data/theme/parse-sass.sh | 3 --- + 4 files changed, 13 insertions(+), 8 deletions(-) + create mode 100644 data/theme/cinnamon-sass/meson.build + delete mode 100755 data/theme/parse-sass.sh + +diff --git a/data/meson.build b/data/meson.build +index dba549d57c..2235c389d3 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -11,8 +11,7 @@ install_subdir( + 'theme', + exclude_files: [ + 'theme-changelog.txt', +- 'meson.build', +- 'parse-sass.sh' ++ 'meson.build' + ], + exclude_directories: ['cinnamon-sass'], + install_dir: pkgdatadir, +diff --git a/data/theme/cinnamon-sass/meson.build b/data/theme/cinnamon-sass/meson.build +new file mode 100644 +index 0000000000..5e97fa97cc +--- /dev/null ++++ b/data/theme/cinnamon-sass/meson.build +@@ -0,0 +1,11 @@ ++sassc = find_program('pysassc', 'sassc') ++ ++custom_target( ++ 'cinnamon_css', ++ input: 'cinnamon.scss', ++ output: 'cinnamon.css', ++ command: [sassc, '@INPUT@', '@OUTPUT@'], ++ build_always_stale: true, ++ install: true, ++ install_dir: join_paths(pkgdatadir, 'theme') ++) +diff --git a/data/theme/meson.build b/data/theme/meson.build +index b02e5c18b0..4e34cc4806 100644 +--- a/data/theme/meson.build ++++ b/data/theme/meson.build +@@ -1,3 +1 @@ +-sassc = find_program('pysassc') +- +-run_command('parse-sass.sh', check: true) ++subdir('cinnamon-sass') +diff --git a/data/theme/parse-sass.sh b/data/theme/parse-sass.sh +deleted file mode 100755 +index 3313971158..0000000000 +--- a/data/theme/parse-sass.sh ++++ /dev/null +@@ -1,3 +0,0 @@ +-#! /bin/bash +- +-pysassc ./cinnamon-sass/cinnamon.scss cinnamon.css |