Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at Fri Apr 15 20:13:10 CEST 2011.
-------- --- emacs/emacs.changes 2010-12-21 16:44:03.000000000 +0100 +++ emacs/emacs.changes 2011-04-15 05:29:07.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 23 14:38:32 JST 2011 - [email protected] +- Add a new patch to fix "dual font spacing problem" + * from https://bugzilla.redhat.com/show_bug.cgi?id=599437 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- emacs-23.2-dual-font.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.spec ++++++ --- /var/tmp/diff_new_pack.ZL2kmA/_old 2011-04-15 20:12:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ZL2kmA/_new 2011-04-15 20:12:39.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package emacs (Version 23.2) +# spec file for package emacs # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,7 +30,7 @@ License: GPLv2+ Group: Productivity/Editors/Emacs Version: 23.2 -Release: 3 +Release: 10 Obsoletes: ge_exec ge_site emac_nox emacmisc emacsbin emacsger emacs-url Mule-UCS emacs-calc erc Requires: emacs-info = %{version} Requires: emacs_program = %{version}-%{release} @@ -63,6 +63,7 @@ Patch20: emacs-23.2-gcc45.dif Patch22: emacs-23.1-bnc628268.patch Patch23: emacs-23.1-rst.patch +Patch24: emacs-23.2-dual-font.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global bug_345669 0 %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} @@ -254,6 +255,7 @@ %patch20 -p0 -b .gcc45 %patch22 %patch23 +%patch24 %build CC=gcc-4.3 ++++++ emacs-23.2-dual-font.patch ++++++ --- src/ftfont.c +++ src/ftfont.c @@ -1262,7 +1262,7 @@ ftfont_open (f, entity, pixel_size) spacing = XINT (AREF (entity, FONT_SPACING_INDEX)); else spacing = FC_PROPORTIONAL; - if (spacing != FC_PROPORTIONAL) + if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL) font->min_width = font->average_width = font->space_width = (scalable ? ft_face->max_advance_width * size / upEM : ft_face->size->metrics.max_advance >> 6); --- src/xftfont.c +++ src/xftfont.c @@ -418,7 +418,7 @@ xftfont_open (f, entity, pixel_size) ascii_printable[i] = ' ' + i; } BLOCK_INPUT; - if (spacing != FC_PROPORTIONAL) + if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL) { font->min_width = font->average_width = font->space_width = xftfont->max_advance_width; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
