can anyone send me the firefox 1.0 diff?

[Franz Klammer]

Joe Marcus Clarke wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Franz Klammer wrote:
> | Joe Marcus Clarke wrote:
> |
> | Franz Klammer wrote:
> | | has anyone still portet firefox 1.0?
> |
> | It's in my ports-stable module.
> |
> | | if yes can i have the diff please?
> | |
> | | i'm working currently on a change of epiphany to build
> | | against firefox.
> |
> | Cool.  I saw they added support for Firefox.
> |
> |
> |> epiphany builds now but if i try to start
> |> the window is there for a mirosecond and then
> |> it crashes with the following error:
> |
> |>  /libexec/ld-elf.so.1:
> |>  /usr/X11R6/lib/firefox/lib/firefox-0.10/
> |>  components/libnecko.so: Undefined symbol "PR_GetAddrInfoByName"
>
> This may have happened in my recent change to not use the system NSPR.
>
> |
> |> also i had to run ldconfig -m by hand.
>
> Wait, you merged /usr/X11R6/lib/firefox/lib/firefox-1.0PR into the
> system ld cache?  That's not good.  Use LD_LIBRARY_PATH instead.
>
OK! with LD_LIBRARY_PATH it's working now.
i added the firefox version check to the startup script.
so epiphany dosn't need to rebuild after a minor firefox update.

attached the patch.

Franz.

> Joe
>
> |
> |> attached the patch for epiphany port to build
> |> with firefox.
> |
> |
> | Joe
> |
> | |
> | | currently it starts the build (with a small hack) but
> | | 0.9.3 is too old - 0.10 is the minimum requirement.
> | |
> | | franz.


-------------- next part --------------
diff -Nur epiphany.orig/Makefile epiphany/Makefile
--- epiphany.orig/Makefile	Thu Sep 30 11:15:12 2004
+++ epiphany/Makefile	Tue Oct  5 16:12:30 2004
@@ -15,22 +15,21 @@
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	An extremely lightweight and simple web browser for GNOME 2
 
-BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+BUILD_DEPENDS=	${DEPENDS_DIR}:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${DEPENDS_DIR}:${PORTSDIR}/www/${MOZILLA}
 
 MOZILLA=	mozilla
 HEADERS_SUFX=
+DEPENDS_DIR=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so
 
-.if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.else
+.if defined(WITH_MOZILLA)
 .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
 MOZILLA=	mozilla-devel
 HEADERS_SUFX=	-devel
-.else
-MOZILLA=	mozilla
+.elif ${WITH_MOZILLA}=="firefox"
+MOZILLA=	firefox
 HEADERS_SUFX=
+DEPENDS_DIR=	${X11BASE}/lib/${MOZILLA}/lib/pkgconfig/firefox-gtkmozembed.pc
 .endif
 .endif
 
@@ -40,9 +39,14 @@
 USE_LIBTOOL_VER=15
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
+.if ${MOZILLA} != "firefox"
+CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/${MOZILLA}" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
+.else
+CONFIGURE_ARGS=	--with-mozilla=firefox
+CONFIGURE_ENV=	PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${X11BASE}/lib/${MOZILLA}/lib/pkgconfig
+.endif
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 GCONF_SCHEMAS=	epiphany-lockdown.schemas epiphany.schemas
@@ -68,6 +72,7 @@
 	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "  mozilla-devel "
+	@${ECHO_MSG} "  firefox "
 	@${ECHO_MSG} ""
 
 post-patch:
@@ -90,7 +95,7 @@
 		> ${WRKDIR}/epiphany
 
 pre-install:
-	@-${X11BASE}/bin/gconftool-2 --shutdown
+	@${X11BASE}/bin/gconftool-2 --shutdown
 
 post-install:
 		@${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin
diff -Nur epiphany.orig/files/epiphany epiphany/files/epiphany
--- epiphany.orig/files/epiphany	Mon Aug 16 16:50:53 2004
+++ epiphany/files/epiphany	Tue Oct  5 15:53:09 2004
@@ -2,6 +2,15 @@
 
 dist_bin=`dirname $0`
 
+WITH_MOZILLA=%%MOZILLA%%
+FIREFOX_VERSION=
+  
+if [ ${WITH_MOZILLA} = "firefox" ]; then 
+   export PKG_CONFIG_PATH=%%X11BASE%%/lib/%%MOZILLA%%/lib/pkgconfig
+   FIREFOX_VERSION=`pkg-config --modversion firefox-gtkmozembed`
+   LD_PATH_ADD="/lib/firefox-${FIREFOX_VERSION}"
+fi
+
 MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
 
 if [ -z "$MOZ_PLUGIN_PATH" ]; then
@@ -10,9 +19,9 @@
 fi
 
 if [ -n "$LD_LIBRARY_PATH" ]; then
-  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+  LD_LIBRARY_PATH=$MOZILLA_HOME${LD_PATH_ADD}:$LD_LIBRARY_PATH
 else
-  LD_LIBRARY_PATH=$MOZILLA_HOME
+  LD_LIBRARY_PATH=$MOZILLA_HOME${LD_PATH_ADD}
 fi
 export LD_LIBRARY_PATH