summaryrefslogtreecommitdiff
path: root/gnome-extra/cinnamon-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/cinnamon-desktop')
-rw-r--r--gnome-extra/cinnamon-desktop/Manifest4
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild (renamed from gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild)4
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild (renamed from gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild)11
3 files changed, 12 insertions, 7 deletions
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
index bde0075a6ec6..a867b46e3144 100644
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ b/gnome-extra/cinnamon-desktop/Manifest
@@ -1,6 +1,6 @@
AUX cinnamon-desktop-6.4.0-remove-pnp_ids-option.patch 16244 BLAKE2B 4ff77ac0adfa5d887caec2409dde56750e60f8ef69fa41050da1d4b7ca7b7a16cb705008c187bb1f8012dda82f613cba52e26be17e71350f265bc2935a6400e3 SHA512 ba9c791829df8a6d01d6db42e3a58b57689ab42ad7f69160ff3d383f632569558027cf54ea5ee67063ad82f376dbffc4b17514ab9ac64f87fd4d551780d0c103
DIST cinnamon-desktop-6.2.0.tar.gz 510369 BLAKE2B e91cc5de64cfa2b936dd224727a493f7ca9049272d7cead88f6e6682b3e11505798d340e245816386e8427712dc3159c416bc51ac6b8cdf937649f34afa247f7 SHA512 be7e4fe206fb4fa62cacf7190b5702035313346ae51a3ef985ec2046d30e0ae5b1e1d314f82d362a363c3949deab02e4d2a4ea910ffe7f279111563c224f75f7
DIST cinnamon-desktop-6.4.1.tar.gz 509746 BLAKE2B 36cc34af24adeaa80bb89440bfbb0676131493c55a418d55397e0d14beff1afecf1c0073b653b5927d830ae16200575489608d9f33c9c8603cdc328890c04a0a SHA512 4089e2261426019b922005480e4d106e2cc6dbba2d28044cefaf7e861597446b484605bf18b7cf114c323a78afe83fb56fe4fceab8b8a986b39a67132ac4b4a5
-EBUILD cinnamon-desktop-6.2.0.ebuild 1714 BLAKE2B 181ec00176e0f12f4335b401a7fc364f7260d2a8cb81c0294d0ef7c8e42b1250add6451d1374d2582e722b336a621ff7fd27ff8d0560d99136b74dc9e0ea88bb SHA512 9fbee55110211224626ff0cda9a63fd22762d4d5d9ba6429e8b6132f2e5141588b485b3ded3b3c9c3b5249ba09dda4c0f008887bacf55ae863811d38c1c0bfe9
-EBUILD cinnamon-desktop-6.4.1.ebuild 1885 BLAKE2B fd251a80904d71a56500bb100854a5ecc27ea00b609c4f26f8aeb28f8a150d2f51c76df7b9574502d200f7ec35a9a47def39c0ab43726b581846600acede218e SHA512 e924e8080f9f94f663f83980ac6cd016a9c646b71c18186efca330bff00b8b732ee4eed2e57ad019a58155bab040a3d4c2ddff8ab7e31741b7fae3b0d9c6dc25
+EBUILD cinnamon-desktop-6.2.0-r1.ebuild 1716 BLAKE2B 17ea5735a895efe6eb031e47cf80f3157224ec2d535d32f03f31b311c915241341682f431bdf9dd4aa61ff69abeb5d9077d4eb35f7455da735b3240836e02310 SHA512 24b3bd894aa9f0493888f860eb1b1607bb6bf6f85e2690ab7b2483705416f71a78dac686d9ba93da5c6b02e9b5bac2c0fc230c07018cbfe4f1c306806dcce0ae
+EBUILD cinnamon-desktop-6.4.1-r1.ebuild 2079 BLAKE2B b9784cbda4fc5294539bcce86e455376916703f4936e00be8240cea05d5966fecbcc2c5d371b3a7596c621427398b844e1350dfabf673141c7e2c42c34f5148a SHA512 87effd276aa6c167506ee7c31588bc2f80da085fa5ea1440075fd322d52c8bbd8b47e842c607d050fa76ee9d92599e8eaf9354da02c7e19dd1ed862b09167f60
MISC metadata.xml 496 BLAKE2B c019ef51b10de9ccafed1294e6d436dcdc8f02735170afe9e038689c6c4d76fb3e099bc9ec7f10c2a50d2bfa5e1d1c191667a470d734effad53d9d299f431664 SHA512 41a99dd4e1aad85dda44e2168bc150e2c27bb40a45c0dfe0f085e502242e6a0704ad8b47f64140d81afa7ff096cac735c46827f3d949962400de92d769505cc4
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
index 975d5f73aba2..3e5eb39cf4d8 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,7 @@ RDEPEND="
sys-apps/hwdata
x11-libs/cairo[X]
>=x11-libs/gdk-pixbuf-2.22:2[introspection]
- >=x11-libs/gtk+-3.3.16:3[introspection]
+ >=x11-libs/gtk+-3.3.16:3[introspection,X]
x11-libs/libX11
>=x11-libs/libXext-1.1
x11-libs/libxkbfile
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
index 2849983c8bc1..a7ca019663f0 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-6.4.1-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..13} )
-inherit meson gnome2-utils python-any-r1
+inherit meson flag-o-matic gnome2-utils python-any-r1
DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-desktop"
@@ -14,6 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
LICENSE="GPL-1 GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
SLOT="0/4" # subslot = libcinnamon-desktop soname version
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="wayland"
RDEPEND="
app-text/iso-codes
@@ -25,7 +26,7 @@ RDEPEND="
virtual/libudev:=
x11-libs/cairo[X]
>=x11-libs/gdk-pixbuf-2.22:2[introspection]
- >=x11-libs/gtk+-3.3.16:3[introspection]
+ >=x11-libs/gtk+-3.3.16:3[introspection,wayland?,X]
x11-libs/libX11
>=x11-libs/libXext-1.1
x11-libs/libxkbfile
@@ -56,6 +57,10 @@ src_prepare() {
}
src_configure() {
+ # defang automagic dependencies
+ # Preliminary wayland support only. Xorg code is unconditional.
+ use wayland || append-cflags -DGENTOO_GTK_HIDE_WAYLAND
+
local emesonargs=(
# https://github.com/linuxmint/cinnamon-desktop/commit/7eadfb1da9a42384396978b8ab46e0725d18e04f
# > Unless/until this fixes an actual identified issue for us or provides significant advantages