Subject: Re: pkgsrc/www/galeon -> 1.3.x (mozilla/gtk2 changes)
To: Brian A. Seklecki <lavalamp@spiritual-machines.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 10/20/2003 09:12:28
Brian,

I have done some of the same. I sent some of these patches to mozilla
maintainer. I also started making a mozilla-gtk2 package. I was doing this
so I could build Epiphany (which has been unsuccessful). I've been told
that fixes may be found in FreeBSD ports, but I haven't looked yet.

My patches for mozilla below. My mozilla-gtk2 pkgsrc (mostly based by
copying mozilla, like patches) is at

   http://www.reedmedia.net/misc/netbsd/packages/www-mozilla-gtk.tar.gz
(26440 bytes)

   Jeremy C. Reed
   http://bsd.reedmedia.net/

cvs server: Diffing www/mozilla
Index: www/mozilla/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla/Makefile.common,v
retrieving revision 1.22
diff -b -u -r1.22 Makefile.common
--- www/mozilla/Makefile.common	2003/09/27 12:16:42	1.22
+++ www/mozilla/Makefile.common	2003/10/20 16:04:32
@@ -20,6 +20,12 @@
 USE_GMAKE=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-gtkmozembed.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-js.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-nspr.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-nss.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-plugin.pc.in
+PKGCONFIG_OVERRIDE+=	${WRKSRC}/build/unix/mozilla-xpcom.pc.in
 CONFIGURE_ARGS+= --disable-tests \
 		--disable-debug \
 		--disable-pedantic \
@@ -36,11 +42,18 @@
 UNLIMIT_RESOURCES=	datasize memorysize stacksize

 .include	"../../graphics/freetype2/buildlink2.mk"
-.include	"../../graphics/gdk-pixbuf/buildlink2.mk"
 .include	"../../graphics/jpeg/buildlink2.mk"
 .include	"../../graphics/png/buildlink2.mk"
+.ifdef BUILD_GTK2
+.include	"../../net/libIDL/buildlink2.mk"
+.include	"../../x11/gtk2/buildlink2.mk"
+CONFIGURE_ARGS+= --enable-default-toolkit=gtk2
+.else
+.include	"../../graphics/gdk-pixbuf/buildlink2.mk"
 .include	"../../net/ORBit/buildlink2.mk"
 .include	"../../x11/gtk/buildlink2.mk"
+CONFIGURE_ARGS+= --enable-default-toolkit=gtk
+.endif

 # NetBSD-*-m68k builds, but "regchrome" dumps core.
 NOT_FOR_PLATFORM=	NetBSD-1.4.*-* NetBSD-*-m68k
cvs server: Diffing www/mozilla/files
Index: www/mozilla/files/moz-install
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla/files/moz-install,v
retrieving revision 1.7
diff -b -u -r1.7 moz-install
--- www/mozilla/files/moz-install	2003/05/13 10:23:19	1.7
+++ www/mozilla/files/moz-install	2003/10/20 16:04:33
@@ -38,6 +38,12 @@
 	${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${PREFIX}/$i
 done

+# install PKGCONFIG
+for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
+	src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
+	${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${PREFIX}/$i
+done
+
 # install DATA
 for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
 	src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
cvs server: Diffing www/mozilla/patches