Date: Sun, 21 Oct 2001 00:55:42 -0700 (PDT) From: Nuzrin Yaapar <p9711422@mmu.edu.my> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/31397: Galeon fix for use with mozilla-0.9.5 - use with PR ports/31396 Message-ID: <200110210755.f9L7tgs32413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 31397
>Category: ports
>Synopsis: Galeon fix for use with mozilla-0.9.5 - use with PR ports/31396
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 21 01:00:01 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Nuzrin Yaapar
>Release: 4.4-STABLE
>Organization:
Multimedia University
>Environment:
[nuzrin@nuzrin ~]> uname -a
FreeBSD nuzrin.cyber.mmu.edu.my 4.4-STABLE FreeBSD 4.4-STABLE #0: Tue Oct 16 08:34:26 MYT 2001 root@nuzrin.cyber.mmu.edu.my:/usr/src/sys/compile/NUZRIN-ATHLON i386
>Description:
* for use with PR ports/31396 which update mozilla-0.9.4 to mozilla-0.9.5
* mozilla-0.9.5 change the location of gtkmozembed.h from mozilla/gtkmozembed.h to mozilla/gtkembedmoz/gtkmozembed.h - so this patch fix the dependency checking for it
* change the include in file src/mozilla/TOCProtocolHandler.cpp from #include <string> to #include <g++/string> because "string" is apparently a directory name under /usr/X11R6/include/mozilla, and I *think* g++ ignore it when it discover "string" is actually a directory. I'm not sure, but the patch make galeon compileable again with mozilla-0.9.5
>How-To-Repeat:
None
>Fix:
[root@nuzrin /usr/ports/www]# diff -ruN galeon/ galeon-new/
diff -ruN galeon/Makefile galeon-new/Makefile
--- galeon/Makefile Tue Oct 16 18:23:18 2001
+++ galeon-new/Makefile Sun Oct 21 15:44:34 2001
@@ -13,7 +13,7 @@
MAINTAINER= gnome@FreeBSD.org
-BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
+BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
msgfmt-new:${PORTSDIR}/devel/gettext-devel
LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv
diff -ruN galeon/files/patch-src::mozilla::TOCProtocolHandler.cpp galeon-new/files/patch-src::mozilla::TOCProtocolHandler.cpp--- galeon/files/patch-src::mozilla::TOCProtocolHandler.cpp Tue Oct 16 18:23:18 2001
+++ galeon-new/files/patch-src::mozilla::TOCProtocolHandler.cpp Sun Oct 21 15:52:22 2001
@@ -1,8 +1,5 @@
-
-$FreeBSD: ports/www/galeon/files/patch-src::mozilla::TOCProtocolHandler.cpp,v 1.2 2001/10/16 07:42:36 sobomax Exp $
-
---- src/mozilla/TOCProtocolHandler.cpp 2001/10/16 07:21:34 1.1
-+++ src/mozilla/TOCProtocolHandler.cpp 2001/10/16 07:21:49
+--- src/mozilla/TOCProtocolHandler.cpp.orig Sun Oct 21 15:51:31 2001
++++ src/mozilla/TOCProtocolHandler.cpp Sun Oct 21 15:51:47 2001
@@ -21,13 +21,7 @@
#include "outputbuffer.h"
@@ -12,8 +9,9 @@
-#elif (GCC_VERSION < VERSION2(3,0)) && (GCC_VERSION > VERSION2(2,90))
-#include <g++-2/string>
-#else
- #include <string>
+-#include <string>
-#endif
++#include <g++/string>
#include <list>
#include <dirent.h>
#include <sys/stat.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110210755.f9L7tgs32413>