From 903b3a5bc384eb96100186dc4fb214788ed0e0f0 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Tue, 20 Jan 2015 11:59:19 +0000 Subject: [PATCH] Fix desktop file (#536348 by Sebastian Pipping) and needs newer cinnamon-desktop (#536350 by him too) Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- gnome-extra/cinnamon-screensaver/ChangeLog | 6 +++++- gnome-extra/cinnamon-screensaver/Manifest | 10 +++++----- .../cinnamon-screensaver-2.4.0.ebuild | 7 +++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gnome-extra/cinnamon-screensaver/ChangeLog b/gnome-extra/cinnamon-screensaver/ChangeLog index 8cebb7bc7da9..0e9096e3858c 100644 --- a/gnome-extra/cinnamon-screensaver/ChangeLog +++ b/gnome-extra/cinnamon-screensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/cinnamon-screensaver # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.8 2015/01/20 11:52:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.9 2015/01/20 11:59:18 pacho Exp $ + + 20 Jan 2015; Pacho Ramos cinnamon-screensaver-2.4.0.ebuild: + Fix desktop file (#536348 by Sebastian Pipping) and needs newer cinnamon- + desktop (#536350 by him too) 20 Jan 2015; Pacho Ramos cinnamon-screensaver-2.2.4.ebuild: 2.2 needs cinnamon to provide needed schemas, in 2.4.x cycle this is no longer diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest index 01b862171636..d44a490fe522 100644 --- a/gnome-extra/cinnamon-screensaver/Manifest +++ b/gnome-extra/cinnamon-screensaver/Manifest @@ -4,13 +4,13 @@ Hash: SHA256 DIST cinnamon-screensaver-2.2.4.tar.gz 141772 SHA256 5fed9a7504856dc362390e3f020b5faa5b4e9a2b4dd09b0e87c04ee18bd40bfa SHA512 b9ed0fa3f660cc6697682f510375bb68eb59517a0d91801f6e047380a9e452747633c1eed3a1b3f82b941e6a890c80206b1a7caf01bb84458c030cfb6441f921 WHIRLPOOL 8bdea21732b9bdbd12aa0ffe4723b54d359ed8a61b8a163532f7045d4effc99a341664be79764e7e15160cb27c87abedcaf7f9869d418c16bb8e6d7058f66990 DIST cinnamon-screensaver-2.4.0.tar.gz 142214 SHA256 fc3a4a1ea9c15db7c5c9fa0fce5e6cf60215778e19c96a19f202ab2afbb9aad8 SHA512 e60837d3b5e77f326a9b1f61a04dbb87d121593f10943d21a0bc4b6f31dffa56e12f7fd633452d618079c5305443cd19a24ee99c46c695e0cde3322d673fff43 WHIRLPOOL 3014d14d9fa8a6af6c035bc672aa793867816d10207b423ead75332f38dc92ef8071cb4a27b608ab5b40b9c626f3ba459e98b0136cf56afc405b23cc8daf14cc EBUILD cinnamon-screensaver-2.2.4.ebuild 2048 SHA256 361d9b134f3edbb1edfe6892b55caf39342557f89157c4fda7154b6511f4f973 SHA512 8aa7fa0c83fe1f24709255fee4f8471fa4e9b0143d7cce007ef25327801cfc780ba5bdc856bbacb10f98577c36927a08be7012496dbf4813694d676867cc62ba WHIRLPOOL a34f8f2dae7987c2285d7ac17107c7679dd7b02e3e157d473fe6ebeb57af1184c6873bd68c6639da50003d45c120db80182bcfda231f661b40bda98d7e93db6b -EBUILD cinnamon-screensaver-2.4.0.ebuild 2020 SHA256 ecdfba49b9e2dc703580f165dcbc4e76bea482c3c67b77b49691bf4e35f26081 SHA512 ced3e1c98e98854c6854be8811c640652afdca2683357c8453c3d9541f74193706d6d0a339d0d2baad9512d473b17009b65767482973c8d7322d0973661b3af7 WHIRLPOOL e4b1a7cc0248fe6bf414d6d3dba6a5573d0591def60cfb6a49c6991c1a1139d3b2899921344472a994f60cd0ca2c416c0b1cfbad8f1940b2be343593cf481d39 -MISC ChangeLog 1549 SHA256 2c9d6e23302f7daf89a0436b2b653269f14859b812957e1ef38b1aa2838818d7 SHA512 6771c62d2a9dc55d6e1034ac924db8633ea86172a3c770a93d4b52963b923355d5ae1a2f36f6ffd0270bb225663d80945bcd88bf4b46058e142c93388b639389 WHIRLPOOL 8e401a38773da9ab486999016b58d1f3aed54b9abf91d4fca94e47d3df11562ad3e05efd6da3575dbd9de4dc7c794d9cd802effe25791d9f214c9497116217d9 +EBUILD cinnamon-screensaver-2.4.0.ebuild 2171 SHA256 3f943f9753a6170174435cf19674c84783ed2a3988d86ca603889957711298f7 SHA512 de169433aed2b07b61d38e94b8daeb2c2c2d619cac0054065376d32313433591ddb2727d35e09bdd1a9ffa92ab225fa7cab4c450c5cdc22dbc48de9036a28a0f WHIRLPOOL 4976bfde0a1a8e8d06b4165ad38c6fe939fb16e286169b58c53379f87789205d47218b4f646761df172994101960b9a9df84dc65856923cbf60a31ff3f2b4e1e +MISC ChangeLog 1738 SHA256 5ba18543f10e093797296cea7cbaaf48da9c96a4eff017a96661d2546cc0f36a SHA512 d1db23e3b651691454bc9887e354f2c5bbf524cf81853be0655a904e9f6ad58deaee4975dc53b96266a9dfb41ec613431da41d541f2a9c633f4993ae25cc1e61 WHIRLPOOL 8d86db88e4b6297c825d9443fbff06a09308811d9b2717dfb4dd08c0dbb5dc3b60f6cdca06d71d69dca6438ad5ef3a64e44de790f2b192e0c490d9cd9e36c3b9 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlS+QY8ACgkQCaWpQKGI+9R7ngCdHDEAyvejNXGyl4scYEKnuq8q -tvAAniye0r0kop1mZitrtlLotXdRT9oX -=Ed0h +iEYEAREIAAYFAlS+QxcACgkQCaWpQKGI+9SZDACfd6GmfJr7BNHnne9CAsLGCrbh +FYsAnjnlvVcwt1GYQZ+vNCSMKMXlUV/0 +=niTX -----END PGP SIGNATURE----- diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild index 7efb58f86116..7ef60b53204c 100644 --- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild +++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild,v 1.1 2015/01/11 16:41:32 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.4.0.ebuild,v 1.2 2015/01/20 11:59:18 pacho Exp $ EAPI="5" GCONF_DEBUG="yes" @@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86" COMMON_DEPEND=" >=dev-libs/glib-2.25.6:2 >=x11-libs/gtk+-2.99.3:3 - >=gnome-extra/cinnamon-desktop-1.0:0= + >=gnome-extra/cinnamon-desktop-2.4:0= >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.71 @@ -58,6 +58,9 @@ DEPEND="${COMMON_DEPEND} " src_prepare() { + # https://github.com/linuxmint/cinnamon-screensaver/issues/80 + sed -i -e 's/X-Cinnamon/X-Cinnamon;/' src/cinnamon-screensaver.desktop.in.in || die + epatch_user eautoreconf gnome2_src_prepare -- 2.26.2