From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#34663: remove ftx font backend Date: Thu, 02 Jan 2020 21:44:41 +0100 Message-ID: <875zhtbnba.fsf@marxist.se> References: <83y2xx21sz.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="11754"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) Cc: 34663@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 02 21:46:31 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1in7MT-0002q4-0n for geb-bug-gnu-emacs@m.gmane.org; Thu, 02 Jan 2020 21:46:29 +0100 Original-Received: from localhost ([::1]:45510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in7MR-00007q-Si for geb-bug-gnu-emacs@m.gmane.org; Thu, 02 Jan 2020 15:46:27 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44267) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1in7L6-0008Ga-NM for bug-gnu-emacs@gnu.org; Thu, 02 Jan 2020 15:45:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1in7L4-0004c0-RI for bug-gnu-emacs@gnu.org; Thu, 02 Jan 2020 15:45:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:34139) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1in7L4-0004al-5B for bug-gnu-emacs@gnu.org; Thu, 02 Jan 2020 15:45:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1in7L4-0007fl-0p for bug-gnu-emacs@gnu.org; Thu, 02 Jan 2020 15:45:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 02 Jan 2020 20:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34663 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: pending patch Original-Received: via spool by 34663-submit@debbugs.gnu.org id=B34663.157799789929472 (code B ref 34663); Thu, 02 Jan 2020 20:45:01 +0000 Original-Received: (at 34663) by debbugs.gnu.org; 2 Jan 2020 20:44:59 +0000 Original-Received: from localhost ([127.0.0.1]:40112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1in7Kx-0007fE-El for submit@debbugs.gnu.org; Thu, 02 Jan 2020 15:44:59 -0500 Original-Received: from ted.gofardesign.uk ([67.225.143.91]:50710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1in7Kr-0007ex-OI for 34663@debbugs.gnu.org; Thu, 02 Jan 2020 15:44:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=marxist.se; s=default; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=UUrcbitPlFMQknrTRz1Hi7pXikHynd9iEJBjtipN2ZA=; b=AxOe6DJOkF3dTSIj/fV2kTlAAA jCQqpcqEAoS/M55Rb2JQd1Sqo6WsohJDsh4V7oujfmUHIxWMzyn7GWWSTC4piTQfTzMnb5L9AvGGs w/bxxdZFNKldm0kpVKcWentLHzSktaCAR22WvUYci8kmwEreoSTlvHynYkxa3LqQGtQ7xhjdjULCN 8XdQiOXpWeUvKXHnqFjYEINL9XMA3QSJeyd3Dz1KbjvJ5Q8L/mL4xRuEfKsA55ihaUv2k1/V6Ms5S itC/wERU9VyHj4i6vwCrOKUb08A1m6odrweLTMlE5lwSgXo9B289RZ5XDhRUY6sd+SxXDKarhHWcB NvTlstLQ==; Original-Received: from h-70-69.a785.priv.bahnhof.se ([155.4.70.69]:41636 helo=localhost) by ted.gofardesign.uk with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1in7Kl-000972-Sw; Thu, 02 Jan 2020 15:44:44 -0500 In-Reply-To: <83y2xx21sz.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 06 Oct 2019 20:58:52 +0300") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - ted.gofardesign.uk X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - marxist.se X-Get-Message-Sender-Via: ted.gofardesign.uk: authenticated_id: stefan@marxist.se X-Authenticated-Sender: ted.gofardesign.uk: stefan@marxist.se X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:174082 Archived-At: --=-=-= Content-Type: text/plain Eli Zaretskii writes: >> From: Stefan Kangas >> Date: Sun, 6 Oct 2019 14:58:39 +0200 >> Cc: 34663@debbugs.gnu.org >> >> > Ref: http://lists.gnu.org/r/emacs-devel/2019-02/msg00340.html >> >> How about the attached patch? > > Thanks, but I'd like to wait with this until Emacs 28. So let's > revisit the issue once the emacs-27 branch is cut (which should happen > in a few weeks, hopefully). Now that the emacs-27 branch is cut, perhaps it is time to consider applying this to master? I have attached a rebased patch. Best regards, Stefan Kangas --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Remove-unused-ftx-font-backend-driver.patch >From 447a50f8953b703d254c8fc3abcaa8b9770b038b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Thu, 2 Jan 2020 08:35:19 +0100 Subject: [PATCH] Remove unused ftx font backend driver * src/ftxfont.c: Remove file. * admin/notes/font-backend: * configure.ac: * src/Makefile.in: * src/deps.mk (ftxfont.o): * src/font.c (syms_of_font): * src/font.h (top-level, font_property_index): * src/xfns.c (Fx_create_frame, x_create_tip_frame): Remove unused ftx font backend driver. Thanks to Glenn Morris for pointing out that it can be removed. (Bug#34663) --- admin/notes/font-backend | 2 -- configure.ac | 6 ++---- src/Makefile.in | 6 +++--- src/deps.mk | 3 --- src/font.c | 1 - src/font.h | 6 ++---- src/xfns.c | 4 ---- 7 files changed, 7 insertions(+), 21 deletions(-) diff --git a/admin/notes/font-backend b/admin/notes/font-backend index 7572182a84..644bacfbef 100644 --- a/admin/notes/font-backend +++ b/admin/notes/font-backend @@ -15,8 +15,6 @@ The new files are: device-independent methods of struct font_driver. xftfont.c -- font-driver on X using Xft for FreeType fonts utilizing methods provided by ftfont.c. - ftxfont.c -- font-driver on X directly using FreeType fonts - utilizing methods provided by ftfont.c. w32font.c -- font driver on w32 using Windows native fonts, corresponding to xfont.c w32uniscribe.c -- font driver on w32, using the uniscribe API diff --git a/configure.ac b/configure.ac index 24d21c7afd..2f737b5d8d 100644 --- a/configure.ac +++ b/configure.ac @@ -3382,8 +3382,6 @@ AC_DEFUN fi # "$HAVE_XFT" != no fi # "x${with_xft}" != "xno" - ## We used to allow building with FreeType and without Xft. - ## However, the ftx font backend driver is not in good shape. if test "$HAVE_XFT" != "yes"; then dnl For the "Does Emacs use" message at the end. HAVE_XFT=no @@ -5267,9 +5265,9 @@ AC_DEFUN if test "$HAVE_CAIRO" = "yes"; then FONT_OBJ="$FONT_OBJ ftfont.o ftcrfont.o" elif test "$HAVE_XFT" = "yes"; then - FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o ftxfont.o" + FONT_OBJ="$FONT_OBJ ftfont.o xftfont.o" elif test "$HAVE_FREETYPE" = "yes"; then - FONT_OBJ="$FONT_OBJ ftfont.o ftxfont.o" + FONT_OBJ="$FONT_OBJ ftfont.o" fi fi if test "${HAVE_HARFBUZZ}" = "yes" ; then diff --git a/src/Makefile.in b/src/Makefile.in index ab63b92627..552dd2e50a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -295,8 +295,8 @@ EMACSRES = W32_RES_LINK=@W32_RES_LINK@ ## Empty if !HAVE_X_WINDOWS -## xfont.o ftfont.o xftfont.o ftxfont.o if HAVE_XFT -## xfont.o ftfont.o ftxfont.o if HAVE_FREETYPE +## xfont.o ftfont.o xftfont.o if HAVE_XFT +## xfont.o ftfont.o if HAVE_FREETYPE ## xfont.o ftfont.o ftcrfont.o if USE_CAIRO ## else xfont.o ## if HAVE_HARFBUZZ, hbfont.o is added regardless of the rest @@ -436,7 +436,7 @@ SOME_MACHINE_OBJECTS = nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o macfont.o \ w32.o w32console.o w32cygwinx.o w32fns.o w32heap.o w32inevt.o w32notify.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ - w16select.o widget.o xfont.o ftfont.o xftfont.o ftxfont.o gtkutil.o \ + w16select.o widget.o xfont.o ftfont.o xftfont.o gtkutil.o \ xsettings.o xgselect.o termcap.o hbfont.o ## gmalloc.o if !SYSTEM_MALLOC && !DOUG_LEA_MALLOC, else empty. diff --git a/src/deps.mk b/src/deps.mk index a7e1b55917..4d162eeb0f 100644 --- a/src/deps.mk +++ b/src/deps.mk @@ -239,9 +239,6 @@ xfont.o: xftfont.o: xftfont.c dispextern.h xterm.h frame.h blockinput.h character.h \ charset.h font.h lisp.h globals.h $(config_h) atimer.h systime.h \ fontset.h ccl.h ftfont.h composite.h -ftxfont.o: ftxfont.c dispextern.h xterm.h frame.h blockinput.h character.h \ - charset.h font.h lisp.h globals.h $(config_h) atimer.h systime.h \ - fontset.h ccl.h menu.o: menu.c lisp.h keyboard.h keymap.h frame.h termhooks.h blockinput.h \ dispextern.h $(srcdir)/../lwlib/lwlib.h xterm.h gtkutil.h menu.h \ lisp.h globals.h $(config_h) systime.h coding.h composite.h window.h \ diff --git a/src/font.c b/src/font.c index 2b90903c90..bb39aef92d 100644 --- a/src/font.c +++ b/src/font.c @@ -5545,7 +5545,6 @@ syms_of_font (void) #ifdef USE_CAIRO syms_of_ftcrfont (); #else - syms_of_ftxfont (); #ifdef HAVE_XFT syms_of_xftfont (); #endif /* HAVE_XFT */ diff --git a/src/font.h b/src/font.h index 633d92709c..0561e3c83f 100644 --- a/src/font.h +++ b/src/font.h @@ -69,8 +69,8 @@ #define EMACS_FONT_H enum font_property_index { - /* FONT-TYPE is a symbol indicating a font backend; currently `x', - `xft', and `ftx' are available on X, `uniscribe' and `gdi' on + /* FONT-TYPE is a symbol indicating a font backend; currently `x' + and `xft' are available on X, `uniscribe' and `gdi' on Windows, and `ns' under Cocoa / GNUstep. */ FONT_TYPE_INDEX, @@ -938,7 +938,6 @@ valid_font_driver (struct font_driver const *d) extern struct font_driver const xfont_driver; extern Lisp_Object xfont_get_cache (struct frame *); extern void syms_of_xfont (void); -extern void syms_of_ftxfont (void); #ifdef HAVE_XFT extern struct font_driver const xftfont_driver; #ifdef HAVE_HARFBUZZ @@ -946,7 +945,6 @@ valid_font_driver (struct font_driver const *d) #endif /* HAVE_HARFBUZZ */ #endif #if defined HAVE_FREETYPE || defined HAVE_XFT -extern struct font_driver const ftxfont_driver; extern void syms_of_xftfont (void); #endif #ifdef HAVE_BDFFONT diff --git a/src/xfns.c b/src/xfns.c index d0d5d399dc..1699d9930c 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3878,8 +3878,6 @@ DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, #ifdef HAVE_HARFBUZZ register_font_driver (&xfthbfont_driver, f); #endif -#else /* not HAVE_XFT */ - register_font_driver (&ftxfont_driver, f); #endif /* not HAVE_XFT */ #endif /* HAVE_FREETYPE */ #endif /* not USE_CAIRO */ @@ -6362,8 +6360,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo, Lisp_Object parms) #ifdef HAVE_HARFBUZZ register_font_driver (&xfthbfont_driver, f); #endif -#else /* not HAVE_XFT */ - register_font_driver (&ftxfont_driver, f); #endif /* not HAVE_XFT */ #endif /* HAVE_FREETYPE */ #endif /* not USE_CAIRO */ -- 2.20.1 --=-=-=--