Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Alexandre Rostovtsev <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: dev-util/devhelp/, dev-util/devhelp/files/
Date: Fri, 23 Nov 2012 07:41:43
Message-Id: 1353656438.7cd87cb423a40b0cba4434f2334df6db8ca32471.tetromino@gentoo
1 commit: 7cd87cb423a40b0cba4434f2334df6db8ca32471
2 Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 23 07:38:46 2012 +0000
4 Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 23 07:40:38 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7cd87cb4
7
8 dev-util/devhelp: fix linking failure with gold, drop unused patch
9
10 ---
11 dev-util/devhelp/devhelp-3.6.1.ebuild | 8 +-
12 .../files/devhelp-3.4.1-gsettings-fonts.patch | 114 --------------------
13 dev-util/devhelp/files/devhelp-3.6.1-libm.patch | 45 ++++++++
14 3 files changed, 51 insertions(+), 116 deletions(-)
15
16 diff --git a/dev-util/devhelp/devhelp-3.6.1.ebuild b/dev-util/devhelp/devhelp-3.6.1.ebuild
17 index bc0a65e..25e78d1 100644
18 --- a/dev-util/devhelp/devhelp-3.6.1.ebuild
19 +++ b/dev-util/devhelp/devhelp-3.6.1.ebuild
20 @@ -7,12 +7,12 @@ GCONF_DEBUG="no"
21 GNOME2_LA_PUNT="yes"
22 PYTHON_DEPEND="2"
23
24 -inherit eutils gnome2 python toolchain-funcs
25 +inherit autotools eutils gnome2 python toolchain-funcs
26
27 DESCRIPTION="An API documentation browser for GNOME"
28 HOMEPAGE="http://live.gnome.org/devhelp"
29
30 -LICENSE="GPL-2"
31 +LICENSE="GPL-2+"
32 SLOT="0"
33 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
34 IUSE=""
35 @@ -40,6 +40,10 @@ src_prepare() {
36 G2CONF="${G2CONF} --with-compile-warnings=no"
37 fi
38
39 + # https://bugzilla.gnome.org/show_bug.cgi?id=688919
40 + epatch "${FILESDIR}/${PN}-3.6.1-libm.patch"
41 + eautoreconf
42 +
43 gnome2_src_prepare
44 python_clean_py-compile_files
45 }
46
47 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
48 deleted file mode 100644
49 index c2d91d3..0000000
50 --- a/dev-util/devhelp/files/devhelp-3.4.1-gsettings-fonts.patch
51 +++ /dev/null
52 @@ -1,114 +0,0 @@
53 -From d761ce906fab110d38d9e71d4c25a334d79b9869 Mon Sep 17 00:00:00 2001
54 -From: =?UTF-8?q?Rafa=C5=82=20Mu=C5=BCy=C5=82o?= <galtgendo@××.pl>
55 -Date: Thu, 3 May 2012 00:15:50 -0400
56 -Subject: [PATCH] stop using obsoleted default keys
57 -
58 -https://bugzilla.gnome.org/show_bug.cgi?id=646402
59 ----
60 - src/dh-preferences.c | 36 ++++++++----------------------------
61 - src/dh-util.c | 14 ++++++++------
62 - 2 files changed, 16 insertions(+), 34 deletions(-)
63 -
64 -diff --git a/src/dh-preferences.c b/src/dh-preferences.c
65 -index 7d75ebf..0f33810 100644
66 ---- a/src/dh-preferences.c
67 -+++ b/src/dh-preferences.c
68 -@@ -287,41 +287,21 @@ preferences_connect_conf_listeners (void)
69 - }
70 - #endif
71 -
72 --/* FIXME: Use the functions in dh-util.c for this. */
73 - static void
74 - preferences_fonts_get_font_names (gboolean use_system_fonts,
75 - gchar **variable,
76 - gchar **fixed)
77 - {
78 -- gchar *var_font_name;
79 -- gchar *fixed_font_name;
80 -- IgeConf *conf;
81 --
82 -- conf = ige_conf_get ();
83 -+ gchar *name;
84 -+ gdouble size;
85 -
86 -- if (use_system_fonts) {
87 --#ifdef GDK_WINDOWING_QUARTZ
88 -- var_font_name = g_strdup ("Lucida Grande 14");
89 -- fixed_font_name = g_strdup ("Monaco 14");
90 --#else
91 -- ige_conf_get_string (conf,
92 -- DH_CONF_SYSTEM_VARIABLE_FONT,
93 -- &var_font_name);
94 -- ige_conf_get_string (conf,
95 -- DH_CONF_SYSTEM_FIXED_FONT,
96 -- &fixed_font_name);
97 --#endif
98 -- } else {
99 -- ige_conf_get_string (conf,
100 -- DH_CONF_VARIABLE_FONT,
101 -- &var_font_name);
102 -- ige_conf_get_string (conf,
103 -- DH_CONF_FIXED_FONT,
104 -- &fixed_font_name);
105 -- }
106 -+ dh_util_font_get_variable (&name, &size, use_system_fonts);
107 -+ *variable = g_strdup_printf ("%s %u", name, (guint)size);
108 -+ g_free (name);
109 -
110 -- *variable = var_font_name;
111 -- *fixed = fixed_font_name;
112 -+ dh_util_font_get_fixed (&name, &size, use_system_fonts);
113 -+ *fixed = g_strdup_printf ("%s %u", name, (guint)size);
114 -+ g_free (name);
115 - }
116 -
117 - static void
118 -diff --git a/src/dh-util.c b/src/dh-util.c
119 -index 74312d2..08151a3 100644
120 ---- a/src/dh-util.c
121 -+++ b/src/dh-util.c
122 -@@ -603,6 +603,7 @@ dh_util_font_get_variable (gchar **name,
123 - {
124 - IgeConf *conf;
125 - gchar *name_and_size;
126 -+ GSettings *settings;
127 -
128 - conf = ige_conf_get ();
129 -
130 -@@ -610,9 +611,9 @@ dh_util_font_get_variable (gchar **name,
131 - #ifdef GDK_WINDOWING_QUARTZ
132 - name_and_size = g_strdup ("Lucida Grande 14");
133 - #else
134 -- ige_conf_get_string (conf,
135 -- DH_CONF_SYSTEM_VARIABLE_FONT,
136 -- &name_and_size);
137 -+ settings = g_settings_new ("org.gnome.desktop.interface");
138 -+ name_and_size = g_settings_get_string (settings, "font-name");
139 -+ g_object_unref (settings);
140 - #endif
141 - } else {
142 - ige_conf_get_string (conf,
143 -@@ -635,6 +636,7 @@ dh_util_font_get_fixed (gchar **name,
144 - {
145 - IgeConf *conf;
146 - gchar *name_and_size;
147 -+ GSettings *settings;
148 -
149 - conf = ige_conf_get ();
150 -
151 -@@ -642,9 +644,9 @@ dh_util_font_get_fixed (gchar **name,
152 - #ifdef GDK_WINDOWING_QUARTZ
153 - name_and_size = g_strdup ("Monaco 14");
154 - #else
155 -- ige_conf_get_string (conf,
156 -- DH_CONF_SYSTEM_FIXED_FONT,
157 -- &name_and_size);
158 -+ settings = g_settings_new ("org.gnome.desktop.interface");
159 -+ name_and_size = g_settings_get_string (settings, "monospace-font-name");
160 -+ g_object_unref (settings);
161 - #endif
162 - } else {
163 - ige_conf_get_string (conf,
164 ---
165 -1.7.8.6
166 -
167
168 diff --git a/dev-util/devhelp/files/devhelp-3.6.1-libm.patch b/dev-util/devhelp/files/devhelp-3.6.1-libm.patch
169 new file mode 100644
170 index 0000000..727ed4a
171 --- /dev/null
172 +++ b/dev-util/devhelp/files/devhelp-3.6.1-libm.patch
173 @@ -0,0 +1,45 @@
174 +From 7ead1d4b000df6f5d31e0df93b8172839c06736d Mon Sep 17 00:00:00 2001
175 +From: Alexandre Rostovtsev <tetromino@g.o>
176 +Date: Fri, 23 Nov 2012 02:33:53 -0500
177 +Subject: [PATCH] libdevhelp: explicitly link with libm for sqrt() in
178 + dh-window.c
179 +
180 +Prevents linking failure when using GNU gold.
181 +
182 +https://bugzilla.gnome.org/show_bug.cgi?id=688919
183 +---
184 + configure.ac | 3 +++
185 + src/Makefile.am | 3 ++-
186 + 2 files changed, 5 insertions(+), 1 deletion(-)
187 +
188 +diff --git a/configure.ac b/configure.ac
189 +index e9c9e87..8849c70 100644
190 +--- a/configure.ac
191 ++++ b/configure.ac
192 +@@ -71,6 +71,9 @@ else
193 + fi
194 + AM_CONDITIONAL(WITH_WEBKIT2, test "x$with_webkit2" != xno)
195 +
196 ++AC_CHECK_LIBM
197 ++AC_SUBST(LIBM)
198 ++
199 + PKG_CHECK_MODULES(DEVHELP, [
200 + gthread-2.0 >= 2.10.0
201 + gtk+-3.0 >= 3.4
202 +diff --git a/src/Makefile.am b/src/Makefile.am
203 +index e6b1716..419c31c 100644
204 +--- a/src/Makefile.am
205 ++++ b/src/Makefile.am
206 +@@ -107,7 +107,8 @@ libdevhelp_3_la_CFLAGS = \
207 +
208 + libdevhelp_3_la_LIBADD = \
209 + $(LIBDEVHELP_LIBS) \
210 +- $(ZLIB_LIBS)
211 ++ $(ZLIB_LIBS) \
212 ++ $(LIBM)
213 +
214 + libdevhelp_3_la_LDFLAGS = \
215 + -no-undefined \
216 +--
217 +1.8.0
218 +
Report Message
Find on MARC Find on Google Groups