public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/
Date: Wed, 12 Oct 2022 23:09:52 +0000 (UTC)	[thread overview]
Message-ID: <1665615893.5aa478fdf0fb9d1bda56eb8971c615b2efa22cc3.sam@gentoo> (raw)

commit:     5aa478fdf0fb9d1bda56eb8971c615b2efa22cc3
Author:     Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com>
AuthorDate: Tue Oct  4 04:26:58 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 23:04:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa478fd

gnome-extra/cinnamon: 5.4.12

Closes: https://bugs.gentoo.org/863197
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gnome-extra/cinnamon/Manifest               |   1 +
 gnome-extra/cinnamon/cinnamon-5.4.12.ebuild | 182 ++++++++++++++++++++++++++++
 2 files changed, 183 insertions(+)

diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 374d935ffcda..b529d4986673 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -1 +1,2 @@
 DIST cinnamon-5.2.7.tar.gz 2423949 BLAKE2B f4ce9ec4c79eab3daadff958c0a334d49757548203078ab657ebe2450f3f179c942df9d0f9089efe313c268c929628d724db43371e12338606d284a2738ed62c SHA512 62cbbe2f719574b3f70a4895c231be9ad65a41220d2755cc1557bc06bb2b31ced93621c356f2973376d127d5a1e59f9295498bbc4812d428e8605e8f4882c733
+DIST cinnamon-5.4.12.tar.gz 2472187 BLAKE2B 3ecd2a628ddf62bff6fe5e054f0b9c3e47efb532f6d310e5f9ddcca0763f35bc41872878d25dd3a50adb937c74a5e00dcfe7c25e3e4074d5a2fdd23745b41fff SHA512 62982a277ea00660b4e39f780d77fdca87c425f8da8dba404c2b6bd806d56c5967c6cc3999281318eace2ab902e35f4b9f8f723f9bb57abb0e7111d1a30752d7

diff --git a/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
new file mode 100644
index 000000000000..e3e3943e4b4d
--- /dev/null
+++ b/gnome-extra/cinnamon/cinnamon-5.4.12.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+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="GPL-2+"
+SLOT="0"
+IUSE="+eds +gstreamer gtk-doc +nls +networkmanager"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+DEPEND="
+	${PYTHON_DEPS}
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		( app-accessibility/at-spi2-atk dev-libs/atk )
+	)
+	>=dev-libs/glib-2.52.0:2[dbus]
+	>=dev-libs/gobject-introspection-1.29.15:=
+	dev-libs/libxml2:2
+	>=gnome-extra/cinnamon-desktop-5.4:0=
+	>=gnome-extra/cinnamon-menus-5.4
+	>=gnome-extra/cjs-5.4[cairo]
+	sys-apps/dbus
+	>=sys-auth/polkit-0.100[introspection]
+	virtual/opengl
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=x11-libs/gtk+-3.12.0:3[introspection]
+	>=x11-libs/libnotify-0.7.3:0=[introspection]
+	x11-libs/libX11
+	>=x11-libs/libXfixes-5.0
+	x11-libs/pango[introspection]
+	>=x11-libs/xapp-2.2.15[introspection]
+	>=x11-wm/muffin-5.4[introspection]
+
+	eds? (
+		gnome-extra/evolution-data-server
+	)
+	gstreamer? (
+		media-libs/gst-plugins-base:1.0
+		media-libs/gstreamer:1.0
+	)
+	networkmanager? (
+		net-misc/networkmanager[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.2.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-5.4[networkmanager=]
+	>=gnome-extra/cinnamon-screensaver-5.4
+	>=gnome-extra/cinnamon-session-5.4
+	>=gnome-extra/cinnamon-settings-daemon-5.4
+	>=gnome-extra/nemo-5.4
+	gnome-extra/polkit-gnome
+	media-libs/gsound
+	net-libs/libsoup:2.4[introspection]
+	net-misc/wget
+	sys-apps/accountsservice[introspection]
+	sys-power/upower[introspection]
+	x11-misc/xdg-utils
+	x11-themes/adwaita-icon-theme
+	x11-themes/gnome-themes-standard
+
+	nls? (
+		>=gnome-extra/cinnamon-translations-5.4
+	)
+"
+BDEPEND="
+	>=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
+)
+
+src_prepare() {
+	xdg_src_prepare
+
+	# Add polkit agent to required components
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	sed -i "s/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/" meson.build || die
+
+	# 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)
+		-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 on Gentoo, causing this to be a dead symlink
+	rm "${ED}/etc/xdg/menus/cinnamon-applications-merged" || die
+
+	# Ensure authentication-agent is started, bug #523958
+	# https://github.com/linuxmint/Cinnamon/issues/3579
+	insinto /etc/xdg/autostart/
+	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
+}
+
+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_postinst
+	gnome2_schemas_update
+}


             reply	other threads:[~2022-10-12 23:10 UTC|newest]

Thread overview: 95+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-12 23:09 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-09-27  5:57 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/cinnamon/ Eli Schwartz
2024-09-25 14:22 Joonas Niilola
2024-09-25 13:58 Joonas Niilola
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-08-23  5:23 Eli Schwartz
2024-06-19  5:24 Arthur Zamarin
2024-06-02 21:16 Sam James
2024-02-15 13:29 Joonas Niilola
2024-02-15 13:29 Joonas Niilola
2023-10-13  7:43 Joonas Niilola
2023-10-04  8:24 Joonas Niilola
2023-09-26 15:59 WANG Xuerui
2023-06-10 23:05 Andreas Sturmlechner
2023-06-05  9:58 Joonas Niilola
2023-06-05  9:58 Joonas Niilola
2023-05-07 22:14 Sam James
2023-05-01  1:43 Sam James
2023-05-01  1:43 Sam James
2022-12-24  7:11 Sam James
2022-11-22  6:20 Sam James
2022-11-22  6:20 Sam James
2022-10-12 23:09 Sam James
2022-09-07  7:52 Michał Górny
2022-05-13 20:07 Jakov Smolić
2022-05-13  4:28 Yixun Lan
2022-05-11  2:11 Sam James
2022-05-05  3:01 Sam James
2022-05-05  3:01 Sam James
2022-05-02  1:11 Sam James
2022-02-27 23:50 Sam James
2022-02-18  2:44 Sam James
2021-12-24 20:00 Jakov Smolić
2021-12-24 19:25 Jakov Smolić
2021-11-23  1:25 Yixun Lan
2021-10-20  1:14 Sam James
2021-10-20  1:14 Sam James
2021-07-31  8:36 Joonas Niilola
2021-07-31  8:36 Joonas Niilola
2021-07-15 11:32 Joonas Niilola
2021-06-12  3:55 Sam James
2021-06-08  7:34 Sam James
2021-06-01 16:28 Joonas Niilola
2021-06-01 16:28 Joonas Niilola
2021-01-06  1:05 Sam James
2020-12-29 17:14 Sam James
2020-12-27  5:06 Sam James
2020-12-16 22:30 Sam James
2020-09-15 14:20 Joonas Niilola
2020-09-09  2:15 Sam James
2020-05-29  0:11 Matt Turner
2019-08-18 12:37 David Seifert
2019-06-07 20:12 Mikle Kolyada
2019-06-04 20:58 Thomas Deutschmann
2019-04-24 16:28 Pacho Ramos
2018-12-08 22:11 Mikle Kolyada
2018-11-28 19:56 Kristian Fiskerstrand
2018-06-23 10:14 Pacho Ramos
2018-04-12 19:07 Thomas Deutschmann
2018-04-06 14:00 Aaron Bauman
2017-11-27 22:20 Kristian Fiskerstrand
2017-11-27 22:20 Kristian Fiskerstrand
2017-11-26 15:43 Kristian Fiskerstrand
2017-09-05 19:45 Kristian Fiskerstrand
2017-07-28 14:27 Kristian Fiskerstrand
2017-06-24 19:56 Kristian Fiskerstrand
2017-06-24 19:41 Kristian Fiskerstrand
2017-06-24 14:58 Kristian Fiskerstrand
2017-02-11 18:31 Pacho Ramos
2017-01-15 19:22 David Seifert
2017-01-15 19:22 David Seifert
2017-01-05 21:22 Kristian Fiskerstrand
2016-12-20 18:23 Kristian Fiskerstrand
2016-11-27 21:33 Kristian Fiskerstrand
2016-11-22 20:42 Kristian Fiskerstrand
2016-10-29 14:51 Mike Gilbert
2016-10-29 14:44 Mike Gilbert
2016-10-29 11:35 Michael Palimaka
2016-10-18 19:07 Kristian Fiskerstrand
2016-10-01  0:54 Pacho Ramos
2016-09-17 13:32 Pacho Ramos
2016-09-17 13:29 Kristian Fiskerstrand
2016-07-09 11:20 Pacho Ramos
2016-06-25 16:53 Pacho Ramos
2016-05-29 12:42 Pacho Ramos
2016-03-06 18:58 Mikle Kolyada
2015-12-26 15:28 Pacho Ramos
2015-11-17 20:23 Pacho Ramos
2015-11-17 20:23 Pacho Ramos
2015-09-07 21:11 Mikle Kolyada
2015-09-03  2:13 Alexandre Rostovtsev
2015-09-03  1:55 Alexandre Rostovtsev
2015-09-03  1:55 Alexandre Rostovtsev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1665615893.5aa478fdf0fb9d1bda56eb8971c615b2efa22cc3.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox