From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: David PONCE Newsgroups: gmane.emacs.devel Subject: A fix to build Emacs with latest CVS sources Date: Thu, 11 Mar 2004 11:59:44 +0100 (CET) Sender: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Message-ID: <10830309.1079002784052.JavaMail.www@wwinf0801> Reply-To: david.ponce@wanadoo.fr NNTP-Posting-Host: deer.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1079218135 6253 80.91.224.253 (13 Mar 2004 22:48:55 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 13 Mar 2004 22:48:55 +0000 (UTC) Original-X-From: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Sat Mar 13 23:48:49 2004 Return-path: Original-Received: from quimby.gnus.org ([80.91.224.244]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1B2Hw1-0006a7-00 for ; Sat, 13 Mar 2004 23:48:49 +0100 Original-Received: from monty-python.gnu.org ([199.232.76.173]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1B2Hw1-0000Ve-00 for ; Sat, 13 Mar 2004 23:48:49 +0100 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B2HoS-0006cv-4i for emacs-devel@quimby.gnus.org; Sat, 13 Mar 2004 17:41:00 -0500 Original-Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30) id 1B2HK4-0007hL-CD for emacs-devel@gnu.org; Sat, 13 Mar 2004 17:09:36 -0500 Original-Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30) id 1B2GOn-0001ei-VM for emacs-devel@gnu.org; Sat, 13 Mar 2004 16:10:58 -0500 Original-Received: from [193.252.22.23] (helo=mwinf0803.wanadoo.fr) by monty-python.gnu.org with esmtp (Exim 4.30) id 1B1Num-0000lX-Sn for emacs-devel@gnu.org; Thu, 11 Mar 2004 05:59:49 -0500 Original-Received: from wwinf0801 (wwinf0801 [172.22.139.28]) by mwinf0803.wanadoo.fr (SMTP Server) with ESMTP id 0ED0018000B3 for ; Thu, 11 Mar 2004 11:59:44 +0100 (CET) Original-To: emacs-devel X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.4 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+emacs-devel=quimby.gnus.org@gnu.org Xref: main.gmane.org gmane.emacs.devel:20410 X-Report-Spam: http://spam.gmane.org/gmane.emacs.devel:20410 Hi All, It looks that Kim's recent change to merge image support is missing something, and breaks Emacs build. FYI, here is the patch I had to apply to fix the issue. Sincerely, David Index: src/Makefile.in =================================================================== RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v retrieving revision 1.292 diff -c -r1.292 Makefile.in *** src/Makefile.in 11 Mar 2004 00:29:25 -0000 1.292 --- src/Makefile.in 11 Mar 2004 10:50:11 -0000 *************** *** 310,318 **** /* Include xmenu.o in the list of X object files. */ #ifdef USE_GTK ! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o #else ! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o #endif /* The X Menu stuff is present in the X10 distribution, but missing --- 310,318 ---- /* Include xmenu.o in the list of X object files. */ #ifdef USE_GTK ! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o image.o #else ! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o #endif /* The X Menu stuff is present in the X10 distribution, but missing Index: src/dispextern.h =================================================================== RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v retrieving revision 1.166 diff -c -r1.166 dispextern.h *** src/dispextern.h 11 Mar 2004 00:29:12 -0000 1.166 --- src/dispextern.h 11 Mar 2004 10:50:11 -0000 *************** *** 2609,2614 **** --- 2609,2615 ---- #endif extern void x_destroy_all_bitmaps P_ ((Display_Info *)); extern int x_create_bitmap_mask P_ ((struct frame * , int)); + extern Lisp_Object x_find_image_file P_ ((Lisp_Object)); /* Defined in sysdep.c */ Index: src/image.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/image.c,v retrieving revision 1.3 diff -c -r1.3 image.c *** src/image.c 11 Mar 2004 05:56:41 -0000 1.3 --- src/image.c 11 Mar 2004 10:50:11 -0000 *************** *** 2005,2011 **** File Handling ***********************************************************************/ - static Lisp_Object x_find_image_file P_ ((Lisp_Object)); static unsigned char *slurp_file P_ ((char *, int *)); --- 2005,2010 ---- *************** *** 2013,2019 **** x-bitmap-file-path. Value is the full name of the file found, or nil if not found. */ ! static Lisp_Object x_find_image_file (file) Lisp_Object file; { --- 2012,2018 ---- x-bitmap-file-path. Value is the full name of the file found, or nil if not found. */ ! Lisp_Object x_find_image_file (file) Lisp_Object file; { Index: src/xfns.c =================================================================== RCS file: /cvsroot/emacs/emacs/src/xfns.c,v retrieving revision 1.607 diff -c -r1.607 xfns.c *** src/xfns.c 11 Mar 2004 00:25:38 -0000 1.607 --- src/xfns.c 11 Mar 2004 10:50:13 -0000 *************** *** 761,768 **** #ifdef USE_GTK - static Lisp_Object x_find_image_file P_ ((Lisp_Object file)); - /* Set icon from FILE for frame F. By using GTK functions the icon may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */ --- 761,766 ----