From 0cf2f20608308acdf3cb922c3736446bbd8f3388 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:58:29 +0100 Subject: gentoo resync : 14.07.2018 --- gnome-base/gnome-menus/Manifest | 6 - .../gnome-menus-3.13.3-multiple-desktop.patch | 171 --------------------- .../gnome-menus-3.13.3-multiple-desktop2.patch | 27 ---- .../gnome-menus-3.8.0-ignore_kde_standalone.patch | 37 ----- .../gnome-menus/gnome-menus-3.13.3-r1.ebuild | 52 ------- gnome-base/gnome-menus/metadata.xml | 8 - 6 files changed, 301 deletions(-) delete mode 100644 gnome-base/gnome-menus/Manifest delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch delete mode 100644 gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch delete mode 100644 gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild delete mode 100644 gnome-base/gnome-menus/metadata.xml (limited to 'gnome-base/gnome-menus') diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest deleted file mode 100644 index 5be24b7c10cb..000000000000 --- a/gnome-base/gnome-menus/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0eb60496c87b9634b817ca538793ba14c56a66934e540a315ba82a54fb0412bfc95234c5e3485f1a6210eac2125f4b77d9a9cacd6113 SHA512 6d7b3cb6d3e445355ea4c77a2930ef93792d5ce1ec44e449576700cea00f1f9e0fd2f1445a7d41675ed5a976501b458a8e650fd0c8e1adb0c1b364832d6f0972 -AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 BLAKE2B 2da46999a7943a61b0032c77e863b201f9a46598dc5da385b5529afa62d3f826373d315132cd1580ef1e63f264e7cc61ca51757ae2bd509e409b4408f3e9cae9 SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d -AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 BLAKE2B 97e21c328c44620d7cacfd302907d846d0d58c86c4e2709231f94318bde97825f59f85616c47d475ec5c1fec969a8d46301532deeb03ab910df2f9cec5692a5e SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0 -DIST gnome-menus-3.13.3.tar.xz 404664 BLAKE2B 7772c817317b4af86e740aeea3095f51ff210f73e53160ca2359d45a017236c82fe787956c04a9e0001e2511671438d4955f0bf7947cdfa8649d78fe931d6d79 SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2 -EBUILD gnome-menus-3.13.3-r1.ebuild 1382 BLAKE2B 8bb7a4381e0975e4c6030708920a8d2a3a192ee52dd0da131cf3c4b8c9aa89eeb5f150a5af2b417955643f2ed2aed1b63b6ffe9fe082b3ac0e0f53578dbeb3ef SHA512 13517cd1fc4b57e6f63d114a273639cfafa3faeb16aaa977a3a9213a12e39fc8cc6a50f8b40b1f7e4f36265d586ac0a7fa76d285d382514ba64a81a42c11fe54 -MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch deleted file mode 100644 index 8ec7006fce5b..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch +++ /dev/null @@ -1,171 +0,0 @@ -From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= -Date: Mon, 27 Oct 2014 18:41:34 +0200 -Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP - -This is based on glib commit: -5a5e16e93c4f11e635918ecdb41681f63fd05a39 ---- - libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------ - 1 file changed, 52 insertions(+), 58 deletions(-) - -diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c -index 326f311..bd4f886 100644 ---- a/libmenu/desktop-entries.c -+++ b/libmenu/desktop-entries.c -@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path) - return path; - } - --static const char * --get_current_desktop (void) -+static const gchar * const * -+get_current_desktops (void) - { -- static char *current_desktop = NULL; -+ static gchar **result; - -- /* Support XDG_CURRENT_DESKTOP environment variable; this can be used -- * to abuse gnome-menus in non-GNOME desktops. */ -- if (!current_desktop) -+ if (g_once_init_enter (&result)) - { -- const char *desktop; -+ const gchar *desktops; -+ gchar **tmp; - -- desktop = g_getenv ("XDG_CURRENT_DESKTOP"); -+ desktops = g_getenv ("XDG_CURRENT_DESKTOP"); - -- /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it -- * was not set */ -- if (!desktop || desktop[0] == '\0') -- current_desktop = g_strdup ("GNOME"); -- else -- current_desktop = g_strdup (desktop); -- } -+ if (desktops) -+ desktops = ""; - -- /* Using "*" means skipping desktop-related checks */ -- if (g_strcmp0 (current_desktop, "*") == 0) -- return NULL; -+ tmp = g_strsplit (desktops, ":", 0); -+ -+ g_once_init_leave (&result, tmp); -+ } - -- return current_desktop; -+ return (const gchar **) result; - } - - static GIcon * -@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file) - static gboolean - key_file_get_show_in (GKeyFile *key_file) - { -- const gchar *current_desktop; -- gchar **strv; -+ const gchar * const *current_desktops; -+ gchar **only_show_in; -+ gchar **not_show_in; - gboolean show_in = TRUE; -- int i; -- -- current_desktop = get_current_desktop (); -- if (!current_desktop) -- return TRUE; -- -- strv = g_key_file_get_string_list (key_file, -- DESKTOP_ENTRY_GROUP, -- "OnlyShowIn", -- NULL, -- NULL); -- if (strv) -+ gint i; -+ -+ current_desktops = get_current_desktops (); -+ only_show_in = g_key_file_get_string_list (key_file, -+ DESKTOP_ENTRY_GROUP, -+ "OnlyShowIn", -+ NULL, -+ NULL); -+ not_show_in = g_key_file_get_string_list (key_file, -+ DESKTOP_ENTRY_GROUP, -+ "NotShowIn", -+ NULL, -+ NULL); -+ -+ for (i = 0; current_desktops[i]; i++) - { -- show_in = FALSE; -- for (i = 0; strv[i]; i++) -+ gint j; -+ -+ if (only_show_in) - { -- if (!strcmp (strv[i], current_desktop)) -+ show_in = FALSE; -+ for (j = 0; only_show_in[j]; j++) - { -- show_in = TRUE; -- break; -+ if (g_str_equal (only_show_in[j], current_desktops[i])) -+ { -+ show_in = TRUE; -+ goto out; -+ } - } - } -- } -- else -- { -- strv = g_key_file_get_string_list (key_file, -- DESKTOP_ENTRY_GROUP, -- "NotShowIn", -- NULL, -- NULL); -- if (strv) -+ -+ if (not_show_in) - { - show_in = TRUE; -- for (i = 0; strv[i]; i++) -+ for (j = 0; not_show_in[j]; j++) - { -- if (!strcmp (strv[i], current_desktop)) -+ if (g_str_equal (not_show_in[j], current_desktops[i])) - { - show_in = FALSE; -+ goto out; - } - } - } - } -- g_strfreev (strv); -+ -+out: -+ g_strfreev (only_show_in); -+ g_strfreev (not_show_in); - - return show_in; - } -@@ -579,14 +580,7 @@ gboolean - desktop_entry_get_show_in (DesktopEntry *entry) - { - if (entry->type == DESKTOP_ENTRY_DESKTOP) -- { -- const char *current_desktop = get_current_desktop (); -- -- if (current_desktop == NULL) -- return TRUE; -- else -- return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop); -- } -+ return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL); - return ((DesktopEntryDirectory*)entry)->showin; - } - --- -cgit v0.11.2 - diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch deleted file mode 100644 index 966b060eac27..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001 -From: Josselin Mouette -Date: Sun, 14 Dec 2014 20:36:36 +0100 -Subject: desktop-entries: fix trivial bug in handling of multiple desktops in - XDG_CURRENT_DESKTOP. - -https://bugzilla.gnome.org/show_bug.cgi?id=741505 ---- - libmenu/desktop-entries.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c -index bd4f886..a463d79 100644 ---- a/libmenu/desktop-entries.c -+++ b/libmenu/desktop-entries.c -@@ -97,7 +97,7 @@ get_current_desktops (void) - - desktops = g_getenv ("XDG_CURRENT_DESKTOP"); - -- if (desktops) -+ if (!desktops) - desktops = ""; - - tmp = g_strsplit (desktops, ":", 0); --- -cgit v0.11.2 - diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch deleted file mode 100644 index ab6cb92d7dda..000000000000 --- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Mon, 25 Feb 2013 16:36:44 +0330 -Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone - ---- - layout/gnome-applications.menu | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu -index 9242eff..94ea6d4 100644 ---- a/layout/gnome-applications.menu -+++ b/layout/gnome-applications.menu -@@ -277,7 +277,19 @@ - - Core - Screensaver -- -+ X-KDE-settings-accessibility -+ X-KDE-settings-components -+ X-KDE-settings-desktop -+ X-KDE-settings-looknfeel -+ X-KDE-settings-network -+ X-KDE-settings-webbrowsing -+ X-KDE-settings-peripherals -+ X-KDE-settings-hardware -+ X-KDE-settings-power -+ X-KDE-settings-security -+ X-KDE-settings-sound -+ X-KDE-settings-system -+ X-KDE-information - - gnome-eog.desktop - gnome-file-roller.desktop --- -1.8.1.2 - diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild deleted file mode 100644 index 675fccc08fec..000000000000 --- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" - -inherit eutils gnome2 - -DESCRIPTION="Library for the Desktop Menu fd.o specification" -HOMEPAGE="https://git.gnome.org/browse/gnome-menus" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="3" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" - -IUSE="+introspection test" - -COMMON_DEPEND=" - >=dev-libs/glib-2.29.15:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) -" -# Older versions of slot 0 install the menu editor and the desktop directories -RDEPEND="${COMMON_DEPEND} - ! - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - -- cgit v1.2.3