From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- gnome-extra/gconf-editor/Manifest | 7 +++ .../files/gconf-editor-3.0.1-assertion-crash.patch | 34 +++++++++++ .../files/gconf-editor-3.0.1-drop-accel.patch | 66 ++++++++++++++++++++++ .../gconf-editor/gconf-editor-3.0.1-r1.ebuild | 34 +++++++++++ gnome-extra/gconf-editor/metadata.xml | 8 +++ 5 files changed, 149 insertions(+) create mode 100644 gnome-extra/gconf-editor/Manifest create mode 100644 gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch create mode 100644 gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch create mode 100644 gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild create mode 100644 gnome-extra/gconf-editor/metadata.xml (limited to 'gnome-extra/gconf-editor') diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest new file mode 100644 index 000000000000..b20e0c1eb0e7 --- /dev/null +++ b/gnome-extra/gconf-editor/Manifest @@ -0,0 +1,7 @@ +AUX gconf-editor-3.0.1-assertion-crash.patch 1194 SHA256 395e2cee14e0246c0da88c19fc0dcf4a0684c519905be34dbcebb97c3fb577ef SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc WHIRLPOOL c00a21a4d5af2703a681b2d61223ca64499b8c30e24c43e24cb13e08138bdbc3c0dac73e083863886475b2f775b294e14138f4b1e35d3412792676e1dc7fb33c +AUX gconf-editor-3.0.1-drop-accel.patch 1383 SHA256 c37e88038127dee1372a32b16160c5ecb0ea829293defe24c5b5859778b75b9f SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff WHIRLPOOL cb2f3fe9f0f21acf802242eb55e0d663729612707b7886c7fc8f0def102b7c61e408016112a5c64190be71fa8adf93129734434e37b9ad2b4fe3c4170aff2816 +DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49 WHIRLPOOL 991a5b7d6b02b3472a9207bb5750d18552ba5da15570f7f884950b838177431a42b1ebb0131bbf3f76abe8f6098a2af88e542ec88d22135f9c8684da0543703f +EBUILD gconf-editor-3.0.1-r1.ebuild 801 SHA256 65c49ba3078b66adbc3cc72d7ebfedafaac7050f423eadd2318ff417c42f4f63 SHA512 97ebb68c595795556438669de55ab6807d0004658bdca72448075c434d0ef6984c0259fc756da84edd13e96ea75a591c182c3684081d8b4c2c858d17f21d4616 WHIRLPOOL bb5c4481135fc85cf08e9dd3e880357f2bdf3462e54e478386cda3a77bebe2c65fddd191b5c47f9afacca0f532cd64760d737c6fecd068ba29d4ddaa622002d5 +MISC ChangeLog 2695 SHA256 9c0496d29c0ee92b7be619171c9871fecef3326a8d0b00c53811619ec670caf5 SHA512 7ec677ef291aa5d00ac68e33527b46c915ef4983931c79aaccdd2c2f802317809894d53046c7a4e6b93013954dae96fb712470e82f23d2e192d73c2816f37749 WHIRLPOOL e6f07ea395d590cc689ef5841b5930a39ad8f82cfdb1e38a7c2dfb8263dab413edf1db599b04ba37abe911bd52262f8186d4941aee6df24b2f27550c2364ac5d +MISC ChangeLog-2015 22747 SHA256 e3781859973a9aea599762507cab88cf5e8a13dad1b2cdd1d93d36fc51cda901 SHA512 fad760ffc8c3a0816c97b70bf7046d5b01bc8ac3c55a57ad803c45fa4697ab3f19a472dd6f2cce37c9f47abb3295539c919e43fd0471ff3423a1a565f4eebfdd WHIRLPOOL b7af497154d3a16b96f301c9de76b725d657632ba96f982045d399d39e2a78b547923922d97b8be66b4f4fff7be96f28baf2bd35b8eacc44f8e77a0031c1e391 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch new file mode 100644 index 000000000000..b7df8f51007d --- /dev/null +++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch @@ -0,0 +1,34 @@ +From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001 +From: Edward Sheldrake +Date: Wed, 11 Apr 2012 07:27:16 +0000 +Subject: Fix assertion failed crash + +Fix "assertion failed: (last_slash != NULL)" crash while navigating the +left tree view, fixed by having the model for the right list view emit +all the row deleted signals before deleting any of its data. + +Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586 +--- +diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c +index 27e1af6..4fc60f8 100644 +--- a/src/gconf-list-model.c ++++ b/src/gconf-list-model.c +@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path) + + if (model->root_path != NULL) { + for (list = model->values; list; list = list->next) { ++ model->stamp++; ++ gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path); ++ } ++ ++ for (list = model->values; list; list = list->next) { + GConfEntry *entry = list->data; + + g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry)); +- model->stamp++; +- gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path); + + gconf_entry_unref (entry); + } +-- +cgit v0.9.2 diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch new file mode 100644 index 000000000000..0d79ec56c396 --- /dev/null +++ b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch @@ -0,0 +1,66 @@ +From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001 +From: William Jon McCann +Date: Thu, 03 May 2012 18:10:53 +0000 +Subject: Drop use GTK accel maps + +They are confusing, weird, and stored in an obsolete location. + +https://bugzilla.gnome.org/show_bug.cgi?id=675392 +--- +diff --git a/src/main.c b/src/main.c +index 8da5ccc..9bce4b8 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -26,34 +26,6 @@ + #include "gconf-stock-icons.h" + #include "gconf-editor-window.h" + +-static char * +-build_accel_filename (void) +-{ +- return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL); +-} +- +-static void +-load_accel_map (void) +-{ +- char *map; +- +- map = build_accel_filename (); +- gtk_accel_map_load (map); +- +- g_free (map); +-} +- +-static void +-save_accel_map (void) +-{ +- char *map; +- +- map = build_accel_filename (); +- gtk_accel_map_save (map); +- +- g_free (map); +-} +- + gint + main (gint argc, gchar **argv) + { +@@ -92,7 +64,6 @@ main (gint argc, gchar **argv) + /* Register our stock icons */ + gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR); + gconf_stock_icons_register (); +- load_accel_map (); + + gtk_window_set_default_icon_name ("gconf-editor"); + +@@ -107,7 +78,6 @@ main (gint argc, gchar **argv) + + gtk_main (); + +- save_accel_map (); + g_strfreev (remaining_args); + + return 0; +-- +cgit v0.9.2 diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild new file mode 100644 index 000000000000..46fca22ad7ea --- /dev/null +++ b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2 + +DESCRIPTION="An editor to the GNOME config system" +HOMEPAGE="https://git.gnome.org/browse/gconf-editor" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND=" + >=x11-libs/gtk+-3.0.0:3 + >=gnome-base/gconf-2.12:2 +" +DEPEND="${RDEPEND} + sys-devel/gettext + app-text/gnome-doc-utils + >=dev-util/intltool-0.35 + virtual/pkgconfig + ~app-text/docbook-xml-dtd-4.1.2 +" +# gnome-common for eautoreconf + +PATCHES=( + # Fix assertion failed crash (from 'master') + "${FILESDIR}/${PN}-3.0.1-assertion-crash.patch" + + # Drop use GTK accel maps (from 'master') + "${FILESDIR}/${PN}-3.0.1-drop-accel.patch" +) diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/gnome-extra/gconf-editor/metadata.xml @@ -0,0 +1,8 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + -- cgit v1.2.3