diff options
| author | marcus <marcus@FreeBSD.org> | 2003-11-26 14:02:15 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2003-11-26 14:02:15 +0800 |
| commit | d33065a683eb191692608447567c9cb6d3f46432 (patch) | |
| tree | 9fef1011e33895d29d347a960243d157849f4321 | |
| parent | 65886e5da604f2d23edc4a0d670469b7a3ce3b54 (diff) | |
| download | freebsd-ports-gnome-d33065a683eb191692608447567c9cb6d3f46432.tar.gz freebsd-ports-gnome-d33065a683eb191692608447567c9cb6d3f46432.tar.zst freebsd-ports-gnome-d33065a683eb191692608447567c9cb6d3f46432.zip | |
Update to 1.2.13 to fix a build with Mozilla 1.5 and 1.6.a.
Reported by: bento via kris
Approved by: portmgr (implicit)
| -rw-r--r-- | www/galeon/Makefile | 13 | ||||
| -rw-r--r-- | www/galeon/distinfo | 2 | ||||
| -rw-r--r-- | www/galeon/files/patch-mozilla_GlobalHistory.cpp | 11 |
3 files changed, 5 insertions, 21 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile index 8facb362bc66..5287fd82d320 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -6,8 +6,7 @@ # PORTNAME= galeon -PORTVERSION= 1.2.12 -PORTREVISION= 2 +PORTVERSION= 1.2.13 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -20,7 +19,7 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="trunk" +MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.5" .if !defined(WITH_MOZILLA) MOZILLA= mozilla @@ -29,7 +28,7 @@ HEADERS_SUFX= .if ${WITH_MOZILLA}=="mozilla-devel" MOZILLA= ${WITH_MOZILLA} HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.5b" +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.6a" .else MOZILLA= mozilla HEADERS_SUFX= @@ -37,7 +36,7 @@ HEADERS_SUFX= .endif USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack bonobo libglade gnomevfs +USE_GNOME= gnomeprefix gnomehack bonobo libglade gnomevfs gnometarget USE_GMAKE= yes USE_LIBTOOL= yes USE_REINPLACE= yes @@ -55,11 +54,7 @@ CONFLICTS= galeon2-* .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 -# Galeon does not build correctly in -CURRENT if -Werror is passed -# to the compiler. NO_WERROR= yes -.endif # allow build with more warnings enabled .if defined(NO_WERROR) CONFIGURE_ARGS+= --disable-werror diff --git a/www/galeon/distinfo b/www/galeon/distinfo index 6dea0536f420..369e019918fb 100644 --- a/www/galeon/distinfo +++ b/www/galeon/distinfo @@ -1 +1 @@ -MD5 (galeon-1.2.12.tar.gz) = 301cc69894a4bb8ba7e9330acd6ebc66 +MD5 (galeon-1.2.13.tar.gz) = 62f0c497b8165fc567f8d2016b40a319 diff --git a/www/galeon/files/patch-mozilla_GlobalHistory.cpp b/www/galeon/files/patch-mozilla_GlobalHistory.cpp deleted file mode 100644 index 403be4c9fc6c..000000000000 --- a/www/galeon/files/patch-mozilla_GlobalHistory.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mozilla/GlobalHistory.cpp.orig Tue Oct 14 17:43:42 2003 -+++ src/mozilla/GlobalHistory.cpp Tue Oct 14 17:44:08 2003 -@@ -108,7 +108,7 @@ - return NS_OK; - } - --#if MOZILLA_SNAPSHOT > 9 -+#if MOZILLA_SNAPSHOT >= 9 - NS_IMETHODIMP GlobalHistory::SetLastPageVisited(const char * aLastPageVisited) - { - mLastPageVisited.Assign(aLastPageVisited); |