Version bump, now supports globs in search tab. Add patch to use gsettings instead of libgnome's gconf keys for default fonts (bug #396637, thanks to Rafał Mużyło).

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 204 insertions, 6 deletions

diff --git a/dev-util/devhelp/ChangeLog b/dev-util/devhelp/ChangeLog
index 1cce0dd7196e..b4fbdcf7d25a 100644
--- a/dev-util/devhelp/ChangeLog
+++ b/dev-util/devhelp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-util/devhelp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.130 2012/04/29 15:39:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/ChangeLog,v 1.131 2012/05/03 05:05:47 tetromino Exp $
+
+*devhelp-3.4.1 (03 May 2012)
+
+  03 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +devhelp-3.4.1.ebuild, +files/devhelp-3.4.1-gsettings-fonts.patch:
+  Version bump, now supports globs in search tab. Add patch to use gsettings
+  instead of libgnome's gconf keys for default fonts (bug #396637, thanks to
+  Rafał Mużyło).
 
   29 Apr 2012; Markus Meier <maekke@gentoo.org> devhelp-3.2.0.ebuild:
   x86 stable, bug #410611
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 600a52052fc1..2847c25f6dc0 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -2,16 +2,23 @@
 Hash: SHA1
 
 AUX devhelp-2.32.0-fix-schema.patch 424 RMD160 32c3009b653c55d1002c42a0808409c74dbc6431 SHA1 c844213a63d60cf031040a4676d17b89dcae07d2 SHA256 4438ed134cc923c62b3beebac732a8be7b61e23cca43f5469e8885e2513c2da6
+AUX devhelp-3.4.1-gsettings-fonts.patch 3708 RMD160 95ed14ba47ada76a4569632767b9bd58c109afaf SHA1 dc320cae782f0ecc25a45f41c20a8d9891a9884a SHA256 b61dd6ba569198566b66f5dc3906177433b1189ec31f11813cfb886bffbfe475
 DIST devhelp-2.32.0.tar.bz2 503689 RMD160 934697815ec13a5629db775bb3b8585c80c8c6f0 SHA1 8a7c15a17ccfb0b39b1f1f8b57f77e544fb3b2b8 SHA256 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
 DIST devhelp-3.2.0.tar.xz 486576 RMD160 314ec9db1f3e7c05a32ee485888b0f416e52fee2 SHA1 b76492d5130ec078e32f0fa359b1be88a988ee34 SHA256 974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e
+DIST devhelp-3.4.1.tar.xz 492976 RMD160 670c175966d8c7d6e6b1422b9aec72311aae9bb1 SHA1 2ed4fda8918abfff8bbf808c860d45310de8f2ba SHA256 3d1148d45d6fac5bb9a4fdf223f19ffa5774aa56df6bbf5b6e86363d8f55552c
 EBUILD devhelp-2.32.0.ebuild 1956 RMD160 3ee6f6c44ac6006b92cea13f17bc60df1d4912c0 SHA1 ea966e950e51711178c4c7c7fed80a002d4386bb SHA256 7c6b87da6546eaa3ff6cc48cf512b166b15294c3b2a8e63eb7d09220f243b0aa
 EBUILD devhelp-3.2.0.ebuild 1708 RMD160 40daf5f372575551f1ea484ec88bfe629d07cc7c SHA1 b2f42e91772924de0309b78d5afda8065d62f5f4 SHA256 b8e72a2d96a587b770166decd156916e0ce12d96c67aa98e3f797b747f206cea
-MISC ChangeLog 17259 RMD160 06655b9c35d8f8436e4879162562f8eae02498ae SHA1 e71529baff59d1d82c66c86fbcdc06f215f331e3 SHA256 85221cb6f68e562995ec49969b2df77ca34d09a438f2ecc016aa3ef5b207e5d3
+EBUILD devhelp-3.4.1.ebuild 1859 RMD160 ce4fe86f4d6bfa0b9d01c4ed2fac1fea213c5fa4 SHA1 b04ded797ad3cb3fae9618ab6153a1f15bb4d1d9 SHA256 33e5864f03ff4e51f1ecb5254955cb3b98070ef1aef00149c6afeeec1c26aed4
+MISC ChangeLog 17595 RMD160 329676603c26aa1ca999e6a74b7f54cbaabc035f SHA1 0af441d2ce25f8ceb2916674a176f28b54c7d41f SHA256 c5814fdf9ab2026554885de0d0de7468204fc0f31f666192b426545ec978a242
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+dYWEACgkQkKaRLQcq0GLgsQCdFiINu96P98Eu0uAKqyoXtlho
-ZHMAoLMMLuZtn2MOY7LL2hfqTJImBQ+w
-=RnOw
+iQEcBAEBAgAGBQJPohIxAAoJEJ0WA1zPCt1hMogIAJi9A8emCMu55QgSSShoaOQf
+vBUFwBi6zd4Kl2zp0gVHSCultzcOv2rbUQ62hEsP3dly6/Q5j6xY9MZse2DynICJ
+0MtUKQ6tXOHnB8EMmBVhJUz/woa3KKSlIrr+vFr64x3PAmRe9GTDxnyZN2W3/Vgd
+oVdYoo0ulTUDZUGzrlhULdzkS5gLevLb3oV1o7+AdTVUfZ774Bc+SJIfkZgIZJJr
+vr4yGECycY+EkihhF2xqu+XaLCrCMyeu6Z9JyQDqXDqlvA7KXeKWWc2nidV/bKuT
+c0DvrWv7MTK/25ZW2lzUzo7/DusmUq8QjTnAGYwVP2UtNheaiDI3w83wc72UaBU=
+=Pr8n
 -----END PGP SIGNATURE-----
diff --git a/dev-util/devhelp/devhelp-3.4.1.ebuild b/dev-util/devhelp/devhelp-3.4.1.ebuild
new file mode 100644
index 000000000000..a896b0f9e9aa
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.4.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/devhelp/devhelp-3.4.1.ebuild,v 1.1 2012/05/03 05:05:47 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2"
+
+inherit eutils gnome2 python toolchain-funcs
+
+DESCRIPTION="An API documentation browser for GNOME 2"
+HOMEPAGE="http://live.gnome.org/devhelp"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND=">=gnome-base/gconf-2.6:2
+	>=dev-libs/glib-2.25.11:2
+	>=x11-libs/gtk+-3.0.2:3
+	>=net-libs/webkit-gtk-1.6:3"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas"
+DEPEND="${COMMON_DEPEND}
+	>=sys-devel/gettext-0.17
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9"
+
+pkg_setup() {
+	DOCS="AUTHORS NEWS README"
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		G2CONF="${G2CONF} --with-compile-warnings=no"
+	fi
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Use gsettings-desktop-schemas instead of obsolete libgnome's
+	# /desktop/gnome/interface/* gconf keys for fonts; bug #396637,
+	# https://bugzilla.gnome.org/show_bug.cgi?id=646402
+	epatch "${FILESDIR}/devhelp-3.4.1-gsettings-fonts.patch"
+
+	gnome2_src_prepare
+
+	python_clean_py-compile_files
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libdevhelp-2.so.1
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/gedit/plugins
+	# Keep all the notify calls around so that users get reminded to delete them
+	preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-1.so.1
+	preserve_old_lib_notify /usr/$(get_libdir)/libdevhelp-2.so.1
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup /usr/$(get_libdir)/gedit/plugins
+}
diff --git a/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch b/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch
new file mode 100644
index 000000000000..c2d91d372e92
--- /dev/null
+++ b/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch
@@ -0,0 +1,114 @@
+From d761ce906fab110d38d9e71d4c25a334d79b9869 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@o2.pl>
+Date: Thu, 3 May 2012 00:15:50 -0400
+Subject: [PATCH] stop using obsoleted default keys
+
+https://bugzilla.gnome.org/show_bug.cgi?id=646402
+---
+ src/dh-preferences.c |   36 ++++++++----------------------------
+ src/dh-util.c        |   14 ++++++++------
+ 2 files changed, 16 insertions(+), 34 deletions(-)
+
+diff --git a/src/dh-preferences.c b/src/dh-preferences.c
+index 7d75ebf..0f33810 100644
+--- a/src/dh-preferences.c
++++ b/src/dh-preferences.c
+@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void)
+ }
+ #endif
+ 
+-/* FIXME: Use the functions in dh-util.c for this. */
+ static void
+ preferences_fonts_get_font_names (gboolean   use_system_fonts,
+                                   gchar    **variable,
+                                   gchar    **fixed)
+ {
+-	gchar   *var_font_name;
+-        gchar   *fixed_font_name;
+-	IgeConf *conf;
+-
+-	conf = ige_conf_get ();
++	gchar   *name;
++	gdouble  size;
+ 
+-	if (use_system_fonts) {
+-#ifdef GDK_WINDOWING_QUARTZ
+-                var_font_name = g_strdup ("Lucida Grande 14");
+-                fixed_font_name = g_strdup ("Monaco 14");
+-#else
+-		ige_conf_get_string (conf,
+-                                     DH_CONF_SYSTEM_VARIABLE_FONT,
+-                                     &var_font_name);
+-		ige_conf_get_string (conf,
+-                                     DH_CONF_SYSTEM_FIXED_FONT,
+-                                     &fixed_font_name);
+-#endif
+-	} else {
+-		ige_conf_get_string (conf,
+-                                     DH_CONF_VARIABLE_FONT,
+-                                     &var_font_name);
+-                ige_conf_get_string (conf,
+-                                     DH_CONF_FIXED_FONT,
+-                                     &fixed_font_name);
+-	}
++	dh_util_font_get_variable (&name, &size, use_system_fonts);
++	*variable = g_strdup_printf ("%s %u", name, (guint)size);
++	g_free (name);
+ 
+-	*variable = var_font_name;
+-	*fixed = fixed_font_name;
++	dh_util_font_get_fixed (&name, &size, use_system_fonts);
++	*fixed = g_strdup_printf ("%s %u", name, (guint)size);
++	g_free (name);
+ }
+ 
+ static void
+diff --git a/src/dh-util.c b/src/dh-util.c
+index 74312d2..08151a3 100644
+--- a/src/dh-util.c
++++ b/src/dh-util.c
+@@ -603,6 +603,7 @@ dh_util_font_get_variable (gchar    **name,
+ {
+ 	IgeConf *conf;
+ 	gchar   *name_and_size;
++	GSettings *settings;
+ 
+ 	conf = ige_conf_get ();
+ 
+@@ -610,9 +611,9 @@ dh_util_font_get_variable (gchar    **name,
+ #ifdef GDK_WINDOWING_QUARTZ
+                 name_and_size = g_strdup ("Lucida Grande 14");
+ #else
+-		ige_conf_get_string (conf,
+-                                     DH_CONF_SYSTEM_VARIABLE_FONT,
+-                                     &name_and_size);
++		settings = g_settings_new ("org.gnome.desktop.interface");
++		name_and_size = g_settings_get_string (settings, "font-name");
++		g_object_unref (settings);
+ #endif
+ 	} else {
+ 		ige_conf_get_string (conf,
+@@ -635,6 +636,7 @@ dh_util_font_get_fixed (gchar    **name,
+ {
+ 	IgeConf *conf;
+ 	gchar   *name_and_size;
++	GSettings *settings;
+ 
+ 	conf = ige_conf_get ();
+ 
+@@ -642,9 +644,9 @@ dh_util_font_get_fixed (gchar    **name,
+ #ifdef GDK_WINDOWING_QUARTZ
+                 name_and_size = g_strdup ("Monaco 14");
+ #else
+-		ige_conf_get_string (conf,
+-                                     DH_CONF_SYSTEM_FIXED_FONT,
+-                                     &name_and_size);
++		settings = g_settings_new ("org.gnome.desktop.interface");
++		name_and_size = g_settings_get_string (settings, "monospace-font-name");
++		g_object_unref (settings);
+ #endif
+ 	} else {
+ 		ige_conf_get_string (conf,
+-- 
+1.7.8.6
+