rpms/epiphany/devel epiphany-2.15.92-use-pango.patch, NONE, 1.1 epiphany.spec, 1.115, 1.116

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/epiphany/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1397

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.15.92-use-pango.patch 
Log Message:
Use Pango


epiphany-2.15.92-use-pango.patch:
 data/epiphany-pango.schemas |   38 +-------------------------------------
 src/ephy-main.c             |    8 +-------
 2 files changed, 2 insertions(+), 44 deletions(-)

--- NEW FILE epiphany-2.15.92-use-pango.patch ---
--- epiphany-2.15.92/src/ephy-main.c.use-pango	2006-08-29 13:37:08.000000000 -0400
+++ epiphany-2.15.92/src/ephy-main.c	2006-08-29 13:38:19.000000000 -0400
@@ -685,18 +685,12 @@
 	gtk_about_dialog_set_url_hook (handle_url, NULL, NULL);
 	gtk_about_dialog_set_email_hook (handle_email, NULL, NULL);
 
-	/* Work around bug #328844, and avoid the gecko+pango performance problem */
-	env = g_getenv ("MOZ_ENABLE_PANGO");
-	enable_pango = env != NULL &&
-		       env[0] != '\0' &&
-		       g_ascii_strtoull (env, NULL, 10) != 0;
-
 	if (eel_gconf_get_boolean (CONF_GECKO_ENABLE_PANGO))
 	{
 		g_print ("NOTE: Enabling gecko pango renderer; this may cause performance degradation.\n"
 			 "You can set " CONF_GECKO_ENABLE_PANGO " to \"false\" to disable it.\n");
 	}
-	else if (!enable_pango)
+	else 
 	{
 		g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
 	}
--- epiphany-2.15.92/data/epiphany-pango.schemas.use-pango	2006-08-29 13:46:16.000000000 -0400
+++ epiphany-2.15.92/data/epiphany-pango.schemas	2006-08-29 13:46:43.000000000 -0400
@@ -6,47 +6,11 @@
       <applyto>/apps/epiphany/web/enable_pango</applyto>
       <owner>epiphany</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
         <short>Whether to enable the gecko pango renderer</short>
         <long>Whether to enabled the gecko pango renderer.</long>
       </locale>
-      <locale name="bn">
-        <default>true</default>
-      </locale>
-      <locale name="gu">
-        <default>true</default>
-      </locale>
-      <locale name="hi">
-        <default>true</default>
-      </locale>
-      <locale name="kn">
-        <default>true</default>
-      </locale>
-      <locale name="ml">
-        <default>true</default>
-      </locale>
-      <locale name="mr">
-        <default>true</default>
-      </locale>
-      <locale name="ne">
-        <default>true</default>
-      </locale>
-      <locale name="pa">
-        <default>true</default>
-      </locale>
-      <locale name="ta">
-        <default>true</default>
-      </locale>
-      <locale name="te">
-        <default>true</default>
-      </locale>
-      <locale name="th">
-        <default>true</default>
-      </locale>
-      <locale name="ur">
-        <default>true</default>
-      </locale>
     </schema>
   </schemalist>
 </gconfschemafile>


Index: epiphany.spec
===================================================================
RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- epiphany.spec	21 Aug 2006 20:38:54 -0000	1.115
+++ epiphany.spec	29 Aug 2006 17:48:45 -0000	1.116
@@ -9,7 +9,7 @@
 Summary: GNOME web browser based on the Mozilla rendering engine
 Name: epiphany
 Version: 2.15.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/
@@ -44,6 +44,7 @@
 
 # Patches
 Patch0: epiphany-1.0.1-home-page.patch
+Patch1: epiphany-2.15.92-use-pango.patch
 
 %description
 epiphany is a simple GNOME web browser based on the Mozilla rendering
@@ -75,6 +76,7 @@
 %setup -q
 
 %patch0 -p1 -b .homepage
+%patch1 -p1 -b .use-pango
 
 %build
 %ifnarch s390 s390x
@@ -155,6 +157,9 @@
 %{_datadir}/pygtk/2.0/defs/epiphany.defs
 
 %changelog
+* Tue Aug 29 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-2.fc6
+- Use Pango by default
+
 * Mon Aug 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.15.92-1.fc6
 - Update to 2.15.92