From owner-freebsd-gnome Thu May 2 10:11:46 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from gyros.marcuscom.com (dhcp-64-102-60-52.cisco.com [64.102.60.52]) by hub.freebsd.org (Postfix) with ESMTP id 341D837B419 for ; Thu, 2 May 2002 10:11:37 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by gyros.marcuscom.com (8.12.3/8.12.3) with ESMTP id g42HBVTQ021980; Thu, 2 May 2002 13:11:32 -0400 (EDT) (envelope-from marcus@marcuscom.com) Subject: Re: Galeon port broken From: Joe Marcus Clarke To: Edward Glowacki Cc: gnome@FreeBSD.ORG In-Reply-To: <1020357932.6938.207.camel@hurakan.cl.msu.edu> References: <1020357932.6938.207.camel@hurakan.cl.msu.edu> Content-Type: multipart/mixed; boundary="=-hNuCp+9KqGcWFMoBGxJJ" X-Mailer: Ximian Evolution 1.0.3 Date: 02 May 2002 13:11:31 -0400 Message-Id: <1020359492.307.43.camel@gyros.marcuscom.com> Mime-Version: 1.0 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --=-hNuCp+9KqGcWFMoBGxJJ Content-Type: text/plain Content-Transfer-Encoding: 7bit On Thu, 2002-05-02 at 13:45, Edward Glowacki wrote: > I'm trying to build the Galeon port (version 1.2.1) on FreeBSD > 4.4-RELEASE and I get the following error: Doh! This is my fault. I blindly used strnstr in my patch not thinking it didn't exist in earlier 4.x releases. Please use the attached patch to replace galeon/files/patch-src_main.c. Let me know if this works for you. Joe > > cc -DHAVE_CONFIG_H -I. -I. -I.. -I../src/mozilla > -I/usr/X11R6/include/mozilla -I/usr/X11R6/include/mozilla/nspr > -I/usr/X11R6/include/mozilla/gtkembedmoz -I/usr/X11R6/include/gconf/1 > -I/usr/X11R6/include -I/usr/local/include/glib12 > -I/usr/local/include/orbit-1.0 -I/usr/X11R6/include/gtk12 > -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/gtk12 > -I/usr/local/include/glib12 -I/usr/local/include > -I/usr/X11R6/include/gnome-vfs-1.0 > -I/usr/X11R6/lib/gnome-vfs-1.0/include -I/usr/X11R6/include/libglade-1.0 > -I/usr/local/include/gnome-xml -DNEED_GNOMESUPPORT_H > -I/usr/local/include/orbit-1.0 -I/usr/X11R6/include/gnome-1.0 > -DSHARE_DIR=\"/usr/X11R6/share/gnome/galeon\" -I/usr/local/include > -I/usr/X11R6/include -D_REENTRANT -D_THREAD_SAFE -pthread > -D_THREAD_SAFE -O -pipe -Wall -Wmissing-declarations > -Wmissing-prototypes -Wsign-compare -Werror -D__const__= -c main.c > cc1: warnings being treated as errors > main.c: In function `translate_url_arguments': > main.c:397: warning: implicit declaration of function `strnstr' > *** Error code 1 > > > My ports tree was updated from cvsup6.freebsd.org this morning. > Some exploration reveals that the problem is introduced in > files/patch-src_main.c and that removing that patch allows Galeon to > compile correctly. > > -- > Edward Glowacki glowack2@msu.edu > Michigan State University > "...a partial solution to the right problem is better than a complete > solution to the wrong one." (http://uiweb.com/issues/issue14.htm) > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-gnome" in the body of the message > -- PGP Key: http://www.marcuscom.com/pgp.asc --=-hNuCp+9KqGcWFMoBGxJJ Content-Disposition: attachment; filename=patch-src_main.c Content-Transfer-Encoding: quoted-printable Content-Type: text/x-c; name=patch-src_main.c; charset=ISO8859-1 --- src/main.c.orig Fri Apr 26 14:29:08 2002 +++ src/main.c Fri Apr 26 14:52:43 2002 @@ -394,7 +394,12 @@ for (i =3D 0; i < n; i++) { /* try to expand as files */ - if (realpath (args[i], buffer) !=3D NULL) + if (strncmp(args[i], "ghelp:", strlen("ghelp:")) && + strncmp(args[i], "toc:", strlen("toc:")) && + strncmp(args[i], "info:", strlen("info:")) && + strncmp(args[i], "main:", strlen("man:")) && + strncmp(args[i], "gnome-help:", strlen("gnome-help")) && + realpath (args[i], buffer) !=3D NULL) { (*urls)[i] =3D g_strconcat ("file://", buffer, NULL); } --=-hNuCp+9KqGcWFMoBGxJJ-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message