This commit is contained in:
Matthias Clasen 2009-08-25 03:36:31 +00:00
parent 74e2327c6b
commit d09a2a9546
2 changed files with 25 additions and 3 deletions

22
yelp-use-pango.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up yelp-2.27.4/src/yelp-main.c.use-pango yelp-2.27.4/src/yelp-main.c
--- yelp-2.27.4/src/yelp-main.c.use-pango 2009-08-06 20:18:11.000000000 -0400
+++ yelp-2.27.4/src/yelp-main.c 2009-08-24 23:20:45.955969896 -0400
@@ -412,18 +412,6 @@ main (int argc, char **argv)
#endif /* WITH_SMCLIENT */
if (private || !main_is_running ()) {
- const gchar *env;
-
- /* workaround for bug #329461 */
- env = g_getenv ("MOZ_ENABLE_PANGO");
-
- if (env == NULL ||
- *env == '\0' ||
- g_str_equal(env, "0"))
- {
- g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
- }
-
if (session_started) {
main_restore_session ();
} else {

View File

@ -24,7 +24,7 @@ Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
URL: http://live.gnome.org/Yelp URL: http://live.gnome.org/Yelp
Patch1: yelp-2.15.5-fedora-docs.patch Patch1: yelp-2.15.5-fedora-docs.patch
Patch2: yelp-2.13.2-add-mime-handling.patch Patch2: yelp-2.13.2-add-mime-handling.patch
Patch3: yelp-2.15.91-use-pango.patch Patch3: yelp-use-pango.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=497559 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
# Patch6: hp.patch # Patch6: hp.patch
@ -32,7 +32,7 @@ Patch3: yelp-2.15.91-use-pango.patch
# XXX Does this no longer apply to yelp >= 2.19.1 ? # XXX Does this no longer apply to yelp >= 2.19.1 ?
#Patch8: yelp-2.18.1-posix-man.patch #Patch8: yelp-2.18.1-posix-man.patch
Patch12: libxul.patch # Patch12: libxul.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=592762 # http://bugzilla.gnome.org/show_bug.cgi?id=592762
Patch13: ellipsis.patch Patch13: ellipsis.patch
@ -88,7 +88,7 @@ documentation written in DocBook.
%patch2 -p1 -b .add-mime-handling %patch2 -p1 -b .add-mime-handling
%patch3 -p1 -b .use-pango %patch3 -p1 -b .use-pango
#%patch6 -p1 -b .hp #%patch6 -p1 -b .hp
%patch12 -p1 -b .libxul #%patch12 -p1 -b .libxul
%patch13 -p1 -b .ellipsis %patch13 -p1 -b .ellipsis
# force regeneration # force regeneration