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/gconf/Manifest | 8 -- .../gconf/files/gconf-2.24.0-no-gconfd.patch | 19 --- .../gconf-2.28.0-entry-set-value-sigsegv.patch | 18 --- .../gconf-3.2.6-gsettings-data-convert-paths.patch | 41 ------ .../gconf/files/gconf-3.2.6-mconvert-crasher.patch | 45 ------- .../files/gconf-3.2.6-spew-console-error.patch | 83 ------------ gnome-base/gconf/gconf-3.2.6-r4.ebuild | 140 --------------------- gnome-base/gconf/metadata.xml | 13 -- 8 files changed, 367 deletions(-) delete mode 100644 gnome-base/gconf/Manifest delete mode 100644 gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch delete mode 100644 gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch delete mode 100644 gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch delete mode 100644 gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch delete mode 100644 gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch delete mode 100644 gnome-base/gconf/gconf-3.2.6-r4.ebuild delete mode 100644 gnome-base/gconf/metadata.xml (limited to 'gnome-base/gconf') diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest deleted file mode 100644 index ee4a9f59ca61..000000000000 --- a/gnome-base/gconf/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX gconf-2.24.0-no-gconfd.patch 787 BLAKE2B d37a7b8c4833ba32406dea408e6c1ab65687ca9ecd6743ccdc0375432d569c4cd9b02e3011cd340f72ce2eae683381f58744cbabf556bd259216f9f3807ab9b7 SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 -AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 BLAKE2B 004abc644ba4ef6f839ba6179152d2de7d3b709aff8aca37609c1da5d2fa6fb20c54faad0895d5bcb972c8826a58743c01a87ccf54c450fe1734f81219a9c126 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa -AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515cace2325479735fec4b024adea8f2ab1fb89e76ef594eeebda897a3d3f52c8e7c48a21d03e2097211d90ed45887c6542ca6cc93a22ae8e6a15 SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b -AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b -AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602 -DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 -EBUILD gconf-3.2.6-r4.ebuild 3662 BLAKE2B 85f27f5b34ef68f5ebc40c3f84fb4d77cd9d8c864f7c43f3204898e216a00cca6109f28918f6dc3596c7e66f987eebeb3244f14deae661eb2f99db62f29cf2e5 SHA512 7741ff144e14a6873886c714b1a3ee7558093c5ef936aaa21b1d5868e394d2e5b350219cb8bc2bf66b44d9830e81dae24dca7ac4dcabce53c29fa27b00ba492c -MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4 diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch deleted file mode 100644 index 8ca6a0d4fc09..000000000000 --- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c ---- GConf-2.23.2.old/gconf/gconftool.c 2008-06-28 05:27:33.000000000 -0400 -+++ GConf-2.23.2/gconf/gconftool.c 2008-09-23 10:20:00.000000000 -0400 -@@ -856,6 +856,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n")); - makefile_install_mode = FALSE; -+ return 0; - } - - if (makefile_uninstall_mode && -@@ -863,6 +864,7 @@ main (int argc, char** argv) - { - g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n")); - makefile_uninstall_mode = FALSE; -+ return 0; - } - - if (makefile_install_mode || makefile_uninstall_mode) diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch deleted file mode 100644 index 680b1a159b4a..000000000000 --- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Romain Perier -Date: Wed, 4 Nov 2009 11:58:25 +0100 -Subject: Do not segfault when entry is NULL - ---- - gconf/gconf-value.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - ---- a/gconf/gconf-value.c -+++ b/gconf/gconf-value.c -@@ -1609,6 +1609,7 @@ void - gconf_entry_set_value (GConfEntry *entry, - const GConfValue *val) - { -+ g_return_if_fail (entry != NULL); - gconf_entry_set_value_nocopy (entry, - val ? gconf_value_copy (val) : NULL); - } diff --git a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch deleted file mode 100644 index dc6c66b1c644..000000000000 --- a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Thu, 24 Oct 2013 16:27:24 -0400 -Subject: gsettings-data-convert: Warn (and fix) invalid schema paths - -See https://bugzilla.gnome.org/show_bug.cgi?id=704802 - -https://bugzilla.gnome.org/show_bug.cgi?id=710836 - -diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c -index 9b2d1d0..160ed41 100644 ---- a/gsettings/gsettings-data-convert.c -+++ b/gsettings/gsettings-data-convert.c -@@ -182,7 +182,23 @@ handle_file (const gchar *filename) - } - - if (schema_path[1] != NULL) -- settings = g_settings_new_with_path (schema_path[0], schema_path[1]); -+ { -+ char *compat_path_alloced = NULL; -+ char *compat_path; -+ /* Work around broken .convert files: -+ https://bugzilla.gnome.org/show_bug.cgi?id=704802 -+ */ -+ if (!g_str_has_suffix (schema_path[1], "/")) -+ { -+ g_warning ("Schema file '%s' has missing trailing / in '%s'", -+ filename, schema_path[1]); -+ compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL); -+ } -+ else -+ compat_path = schema_path[1]; -+ settings = g_settings_new_with_path (schema_path[0], compat_path); -+ g_free (compat_path_alloced); -+ } - else - settings = g_settings_new (schema_path[0]); - --- -cgit v0.10.1 - diff --git a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch deleted file mode 100644 index 54681bcb0e86..000000000000 --- a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001 -From: Stefan Sauer -Date: Wed, 23 Jan 2013 08:11:18 +0100 -Subject: mconvert: enable recursive scheme lookup and fix a crasher - -The recursive scheme lookup is needed to scan the whole settings path. The crash -would happen in the case of a misconfiguration (e.g. building gconf from source -and running uninstalled while the configure settings don't match the one used to -create the installed package). - -diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c -index a8af942..9b2d1d0 100644 ---- a/gsettings/gsettings-data-convert.c -+++ b/gsettings/gsettings-data-convert.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -90,6 +91,10 @@ get_writable_client (void) - GSList *addresses; - - addresses = get_writable_source_path (); -+ if (!addresses) { -+ g_printf("No writable gconf locations found\n"); -+ exit (1); -+ } - engine = gconf_engine_get_local_for_addresses (addresses, NULL); - gconf_address_list_free (addresses); - -@@ -155,7 +160,7 @@ handle_file (const gchar *filename) - - schema_path = g_strsplit (groups[i], ":", 2); - -- schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE); -+ schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE); - if (schema == NULL) - { - if (verbose) --- -cgit v0.10.1 - diff --git a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch deleted file mode 100644 index 26503f7216ea..000000000000 --- a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch +++ /dev/null @@ -1,83 +0,0 @@ -From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 15 Apr 2013 09:57:34 -0400 -Subject: dbus: Don't spew to console when unable to connect to dbus daemon - -Instead pass the error up for the caller to decide what to do. - -This prevent untrappable warning messages from showing up at the -console if gconftool --makefile-install-rule is called. - -diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c -index 5610fcf..048e3ea 100644 ---- a/gconf/gconf-dbus.c -+++ b/gconf/gconf-dbus.c -@@ -105,7 +105,7 @@ static GHashTable *engines_by_db = NULL; - static GHashTable *engines_by_address = NULL; - static gboolean dbus_disconnected = FALSE; - --static gboolean ensure_dbus_connection (void); -+static gboolean ensure_dbus_connection (GError **error); - static gboolean ensure_service (gboolean start_if_not_found, - GError **err); - static gboolean ensure_database (GConfEngine *conf, -@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf) - } - - static gboolean --ensure_dbus_connection (void) -+ensure_dbus_connection (GError **err) - { - DBusError error; - -@@ -392,7 +392,9 @@ ensure_dbus_connection (void) - - if (dbus_disconnected) - { -- g_warning ("The connection to DBus was broken. Can't reinitialize it."); -+ g_set_error (err, GCONF_ERROR, -+ GCONF_ERROR_NO_SERVER, -+ "The connection to DBus was broken. Can't reinitialize it."); - return FALSE; - } - -@@ -402,7 +404,10 @@ ensure_dbus_connection (void) - - if (!global_conn) - { -- g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message); -+ g_set_error (err, GCONF_ERROR, -+ GCONF_ERROR_NO_SERVER, -+ "Client failed to connect to the D-BUS daemon:\n%s", -+ error.message); - - dbus_error_free (&error); - return FALSE; -@@ -431,13 +436,8 @@ ensure_service (gboolean start_if_not_found, - - if (global_conn == NULL) - { -- if (!ensure_dbus_connection ()) -- { -- g_set_error (err, GCONF_ERROR, -- GCONF_ERROR_NO_SERVER, -- _("No D-BUS daemon running\n")); -- return FALSE; -- } -+ if (!ensure_dbus_connection (err)) -+ return FALSE; - - g_assert (global_conn != NULL); - } -@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void) - { - if (global_conn == NULL) - { -- if (!ensure_dbus_connection ()) -+ if (!ensure_dbus_connection (NULL)) - { - return FALSE; - } --- -cgit v0.10.1 - diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild deleted file mode 100644 index 0676bfbde501..000000000000 --- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GCONF_DEBUG="yes" -GNOME_ORG_MODULE="GConf" -GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="xml" - -inherit eutils gnome2 multilib-minimal python-r1 - -DESCRIPTION="GNOME configuration system and daemon" -HOMEPAGE="https://projects.gnome.org/gconf/" - -LICENSE="LGPL-2+" -SLOT="2" -KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux" -IUSE="debug +introspection ldap policykit" - -RDEPEND=" - ${PYTHON_DEPS} - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100.2:=[${MULTILIB_USEDEP}] - >=sys-apps/dbus-1.6.18-r1:=[${MULTILIB_USEDEP}] - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) - ldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] ) - policykit? ( sys-auth/polkit:= ) -" -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/gtk-doc-am - >=dev-util/intltool-0.35 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] -" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -pkg_setup() { - kill_gconf -} - -src_prepare() { - # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983 - epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch" - - # Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985 - epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch" - - # From 'master' - # mconvert: enable recursive scheme lookup and fix a crasher - epatch "${FILESDIR}/${P}-mconvert-crasher.patch" - - # dbus: Don't spew to console when unable to connect to dbus daemon - epatch "${FILESDIR}/${P}-spew-console-error.patch" - - # gsettings-data-convert: Warn (and fix) invalid schema paths - epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch" - - gnome2_src_prepare -} - -multilib_src_configure() { - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --disable-static \ - --enable-gsettings-backend \ - --with-gtk=3.0 \ - --disable-orbit \ - $(multilib_native_use_enable introspection) \ - $(use_with ldap openldap) \ - $(multilib_native_use_enable policykit defaults-service) - - if multilib_is_native_abi; then - ln -s "${S}"/doc/gconf/html doc/gconf/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} - -multilib_src_install_all() { - python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert - - keepdir /etc/gconf/gconf.xml.mandatory - keepdir /etc/gconf/gconf.xml.defaults - # Make sure this directory exists, bug #268070, upstream #572027 - keepdir /etc/gconf/gconf.xml.system - - echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf - echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf - doenvd 50gconf - dodir /root/.gconfd -} - -pkg_preinst() { - kill_gconf - gnome2_pkg_preinst -} - -pkg_postinst() { - kill_gconf - - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - multilib_foreach_abi multilib_pkg_postinst - - # change the permissions to avoid some gconf bugs - einfo "changing permissions for gconf dirs" - find "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \; - - einfo "changing permissions for gconf files" - find "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \; -} - -pkg_postrm() { - gnome2_pkg_postrm - - multilib_pkg_postrm() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - multilib_foreach_abi multilib_pkg_postrm -} - -kill_gconf() { - # This function will kill all running gconfd-2 that could be causing troubles - if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ] - then - "${EPREFIX}"/usr/bin/gconftool-2 --shutdown - fi - - return 0 -} diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml deleted file mode 100644 index d2a393a8590c..000000000000 --- a/gnome-base/gconf/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - gnome@gentoo.org - Gentoo GNOME Desktop - - - Build backend which enables default mail accounts, - addressbooks and calendars for Evolution to be configured using each - user's LDAP entry." - - -- cgit v1.2.3