diff options
| author | drochner <drochner> | 2002-08-29 20:00:20 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2002-08-29 20:00:20 +0000 |
| commit | e1cc07faf99468b3b4bd2e698244d387ea036cae (patch) | |
| tree | 6f22adcd220d83b035dbfbb429f54afceaf8bbda | |
| parent | fb736768b247f75f74aae10aa80182e77e2f09a3 (diff) | |
| download | pkgsrc-e1cc07faf99468b3b4bd2e698244d387ea036cae.tar.gz | |
take a sledgehammer and make this compile with mozilla-1.1
| -rw-r--r-- | www/galeon/Makefile | 6 | ||||
| -rw-r--r-- | www/galeon/distinfo | 3 | ||||
| -rw-r--r-- | www/galeon/patches/patch-aa | 43 |
3 files changed, 49 insertions, 3 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 6c75b25bf51..6db161f3f56 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2002/07/16 13:16:05 agc Exp $ +# $NetBSD: Makefile,v 1.34 2002/08/29 20:00:20 drochner Exp $ DISTNAME= galeon-1.2.5 CATEGORIES= www @@ -11,7 +11,7 @@ COMMENT= GNOME web browser based on gecko (mozilla rendering engine) CONFLICTS= galeon-current-[0-9]* BUILD_DEPENDS+= xml-i18n-tools>=0.8.1:../../textproc/xml-i18n-tools -DEPENDS+= mozilla>=1.0:../../www/mozilla +DEPENDS+= mozilla-1.1nb1:../../www/mozilla USE_X11BASE= yes USE_GMAKE= yes @@ -22,6 +22,8 @@ CONFIGURE_ARGS+= --with-mozilla-includes=${PREFIX}/include/mozilla \ --disable-applet \ --disable-werror \ --sysconfdir=${PREFIX}/etc +# XXX to build against mozilla 1.1 +CONFIGURE_ARGS+= --with-mozilla-snapshot=trunk .include "../../x11/gnome-libs/buildlink.mk" .include "../../devel/libglade/buildlink.mk" diff --git a/www/galeon/distinfo b/www/galeon/distinfo index ae6325f738e..a34bfce429b 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.25 2002/06/09 15:40:37 taya Exp $ +$NetBSD: distinfo,v 1.26 2002/08/29 20:00:21 drochner Exp $ SHA1 (galeon-1.2.5.tar.gz) = 93977e663709260c4f566d60ffeef29f4abab886 Size (galeon-1.2.5.tar.gz) = 4004289 bytes +SHA1 (patch-aa) = f088d7ffee942263a312c362d7fb462ca8da30d1 diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa new file mode 100644 index 00000000000..4e481e07557 --- /dev/null +++ b/www/galeon/patches/patch-aa @@ -0,0 +1,43 @@ +$NetBSD: patch-aa,v 1.8 2002/08/29 20:00:22 drochner Exp $ + +--- src/mozilla/ProgressListener2.cpp.orig Thu Aug 29 20:56:41 2002 ++++ src/mozilla/ProgressListener2.cpp Thu Aug 29 20:56:50 2002 +@@ -334,7 +334,7 @@ + NS_IMETHODIMP GProgressListener2::Init(nsIURI *aSource, + nsILocalFile *aTarget, + const PRUnichar *aDisplayName, +- const PRUnichar *openingWith, ++ nsIMIMEInfo *openingWith, + PRInt64 aStartTime, + nsIWebBrowserPersist *aPersist) + { +@@ -379,11 +379,29 @@ + return NS_OK; + } + ++#if 0 + NS_IMETHODIMP GProgressListener2::GetOpeningWith(PRUnichar * *aOpeningWith) + { + *aOpeningWith = NULL; + return NS_OK; + } ++#else ++NS_IMETHODIMP GProgressListener2::GetMIMEInfo(nsIMIMEInfo **mi) ++{ ++ *mi = NULL; ++ return NS_OK; ++} ++NS_IMETHODIMP GProgressListener2::SetCancelDownloadOnClose(int val) ++{ ++ return NS_OK; ++} ++NS_IMETHODIMP GProgressListener2::GetCancelDownloadOnClose(int *val) ++{ ++ *val = 0; ++ return NS_OK; ++} ++#endif ++ + /* attribute nsIObserver observer; */ + NS_IMETHODIMP GProgressListener2::GetObserver(nsIObserver * *aObserver) + { |