aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/galeon2/Makefile47
-rw-r--r--www/galeon2/distinfo2
-rw-r--r--www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c10
-rw-r--r--www/galeon2/files/patch-configure13
-rw-r--r--www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp41
-rw-r--r--www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp27
-rw-r--r--www/galeon2/files/patch-mozilla_GlobalHistory.cpp27
-rw-r--r--www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp41
-rw-r--r--www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp28
-rw-r--r--www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp25
-rw-r--r--www/galeon2/pkg-plist4
11 files changed, 38 insertions, 227 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index d1bf64c38695..aa04675b5066 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= galeon2
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
@@ -20,26 +19,30 @@ BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.2"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.3b"
-.if !defined(WITH_MOZILLA)
-MOZILLA= mozilla-gtk2
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
-MOZILLA= ${WITH_MOZILLA}
+MOZILLA= mozilla-devel-gtk2
HEADERS_SUFX= -devel
-MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
-.else
-MOZILLA= mozilla
-HEADERS_SUFX=
-.endif
-.endif
+
+#.if !defined(WITH_MOZILLA)
+#MOZILLA= mozilla-gtk2
+#HEADERS_SUFX=
+#.else
+#.if ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+#MOZILLA= ${WITH_MOZILLA}
+#HEADERS_SUFX= -devel
+#MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk"
+#.else
+#MOZILLA= mozilla
+#HEADERS_SUFX=
+#.endif
+#.endif
USE_X_PREFIX= yes
USE_GNOMENG= yes
USE_GNOME= gnomeprefix gnomehack
USE_LIBTOOL= yes
+USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
@@ -59,13 +62,13 @@ MAN1= galeon.1
CONFIGURE_ARGS+= --disable-werror
.endif
-post-extract:
- @${ECHO_MSG}
- @${ECHO_MSG} " By default the port uses www/mozilla-gtk2 for html rendering, but you can"
- @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
- @${ECHO_MSG}
- @${ECHO_MSG} " mozilla-devel-gtk2 "
- @${ECHO_MSG}
+#post-extract:
+# @${ECHO_MSG}
+# @${ECHO_MSG} " By default the port uses www/mozilla-gtk2 for html rendering, but you can"
+# @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+# @${ECHO_MSG}
+# @${ECHO_MSG} " mozilla-devel-gtk2 "
+# @${ECHO_MSG}
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 871f8e6f80b8..c9f8007194cf 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.3.1.tar.gz) = 136f6d69e53fa9a6d66072f6c410a28d
+MD5 (galeon-1.3.2.tar.gz) = bbec6131a4fecd655f389193a4e35beb
diff --git a/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
new file mode 100644
index 000000000000..6a54adc321dc
--- /dev/null
+++ b/www/galeon2/files/patch-bookmarks_bookmarks-import-druid-konqueror.c
@@ -0,0 +1,10 @@
+--- bookmarks/bookmarks-import-druid-konqueror.c.orig Sun Feb 16 18:36:14 2003
++++ bookmarks/bookmarks-import-druid-konqueror.c Sun Feb 16 18:36:40 2003
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #endif
+
++#include <sys/types.h>
+ #include <libgnome/gnome-i18n.h>
+ #include "bookmarks-import-druid-konqueror.h"
+ #include "gul-gobject-misc.h"
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index 1624ed425cb4..f8bc9fe02fb6 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -8,16 +8,3 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18588,7 +18589,11 @@
- # Check whether --enable-werror or --disable-werror was given.
- if test "${enable_werror+set}" = set; then
- enableval="$enable_werror"
-- disable_werror=no
-+ if test "x$enable_werror" != "xno"; then
-+ disable_werror=no
-+ else
-+ disable_werror=yes
-+ fi
- else
- disable_werror=yes
- fi;
diff --git a/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp
deleted file mode 100644
index d95b514b9019..000000000000
--- a/www/galeon2/files/patch-mozilla_BaseHelpProtocolHandler.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- mozilla/BaseHelpProtocolHandler.cpp.orig Thu Feb 13 16:08:39 2003
-+++ mozilla/BaseHelpProtocolHandler.cpp Thu Feb 13 16:13:24 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include "outputbuffer.h"
-
- #ifdef NOT_PORTED
-@@ -194,17 +198,23 @@
-
- /* finish the rendering */
- nsCOMPtr<nsIInputStream> iStream;
-- PRUint32 size;
--
-- rv = sStream->GetLength(&size);
-- if (NS_FAILED(rv)) return rv;
-
- rv = sStream->NewInputStream(0, getter_AddRefs(iStream));
- if (NS_FAILED(rv)) return rv;
-
-+#if MOZILLA_SNAPSHOT > 3
-+ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
-+ iStream, NS_LITERAL_CSTRING("text/html"),
-+ NS_LITERAL_CSTRING("utf-8"));
-+#else
-+ PRUint32 size;
-+ rv = sStream->GetLength(&size);
-+ if (NS_FAILED(rv)) return rv;
-+
- rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
- iStream, NS_LITERAL_CSTRING("text/html"),
- NS_LITERAL_CSTRING("utf-8"), size);
-+#endif
- if (NS_FAILED(rv)) return rv;
-
- return rv;
diff --git a/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp b/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp
deleted file mode 100644
index 10189ebf7100..000000000000
--- a/www/galeon2/files/patch-mozilla_BaseProtocolContentHandler.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla/BaseProtocolContentHandler.cpp.orig Thu Feb 13 16:21:02 2003
-+++ mozilla/BaseProtocolContentHandler.cpp Thu Feb 13 16:22:10 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include "nsCOMPtr.h"
- #include "nsIURI.h"
- #include "nsIChannel.h"
-@@ -63,8 +67,13 @@
- if (NS_FAILED(rv)) return rv;
-
- nsCOMPtr<nsIChannel> channel;
-+#if MOZILLA_SNAPSHOT > 3
-+ rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI,
-+ iStream, mMimeType, NS_LITERAL_CSTRING(""));
-+#else
- rv = NS_NewInputStreamChannel(getter_AddRefs(channel), aURI,
- iStream, mMimeType, NS_LITERAL_CSTRING(""), 0);
-+#endif
- if (NS_FAILED(rv)) return rv;
-
- NS_IF_ADDREF (*_retval = channel);
diff --git a/www/galeon2/files/patch-mozilla_GlobalHistory.cpp b/www/galeon2/files/patch-mozilla_GlobalHistory.cpp
deleted file mode 100644
index eebb779a43f7..000000000000
--- a/www/galeon2/files/patch-mozilla_GlobalHistory.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla/GlobalHistory.cpp.orig Thu Feb 13 16:30:19 2003
-+++ mozilla/GlobalHistory.cpp Thu Feb 13 16:32:29 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include "galeon-config.h"
- #include "mozilla-embed-shell.h"
-
-@@ -149,6 +153,13 @@
- {
- return NS_ERROR_NOT_IMPLEMENTED;
- }
-+
-+#if MOZILLA_SNAPSHOT > 3
-+NS_IMETHODIMP MozGlobalHistory::OutputReferrerURL(const char *aURL, const char *aReferrer)
-+{
-+ return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+#endif
-
- NS_DEF_FACTORY (MozGlobalHistory, MozGlobalHistory);
-
diff --git a/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp
deleted file mode 100644
index e232fd5ec205..000000000000
--- a/www/galeon2/files/patch-mozilla_MyportalProtocolHandler.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- mozilla/MyportalProtocolHandler.cpp.orig Thu Feb 13 16:23:25 2003
-+++ mozilla/MyportalProtocolHandler.cpp Thu Feb 13 16:26:47 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include "bookmarks.h"
- #include "bookmarks-iterator.h"
- #include "eel-gconf-extensions.h"
-@@ -249,17 +253,23 @@
- g_free (myportalURI);
- #else
- nsCOMPtr<nsIInputStream> iStream;
-- PRUint32 size;
--
-- rv = sStream->GetLength(&size);
-+ rv = sStream->NewInputStream(0, getter_AddRefs(iStream));
-+
- if (NS_FAILED(rv)) return rv;
-
-- rv = sStream->NewInputStream(0, getter_AddRefs(iStream));
-+#if MOZILLA_SNAPSHOT > 3
-+ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
-+ iStream, NS_LITERAL_CSTRING("text/html"),
-+ NS_LITERAL_CSTRING("utf-8"));
-+#else
-+ PRUint32 size;
-+ rv = sStream->GetLength(&size);
- if (NS_FAILED(rv)) return rv;
-
- rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
- iStream, NS_LITERAL_CSTRING("text/html"),
- NS_LITERAL_CSTRING("utf-8"), size);
-+#endif
- if (NS_FAILED(rv)) return rv;
- #endif
- g_free (stylesheet_filename);
diff --git a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
index 1ab447462541..cdb7d9860d81 100644
--- a/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
+++ b/www/galeon2/files/patch-mozilla_TOCProtocolHandler.cpp
@@ -11,34 +11,6 @@
/* Implementation file */
NS_IMPL_ISUPPORTS1 (GTOCProtocolHandler, nsIProtocolHandler)
-@@ -126,17 +126,24 @@
- if (NS_FAILED(rv)) return rv;
-
- /* finish the rendering */
-- PRUint32 size;
-- rv = mStream->GetLength(&size);
-- if (NS_FAILED(rv)) return rv;
-
- nsCOMPtr<nsIInputStream> iStream;
- rv = mStream->NewInputStream(0, getter_AddRefs(iStream));
- if (NS_FAILED(rv)) return rv;
-
-+#if MOZILLA_SNAPSHOT > 3
-+ rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
-+ iStream, NS_LITERAL_CSTRING("text/html"),
-+ NS_LITERAL_CSTRING("utf-8"));
-+#else
-+ PRUint32 size;
-+ rv = mStream->GetLength(&size);
-+ if (NS_FAILED(rv)) return rv;
-+
- rv = NS_NewInputStreamChannel(getter_AddRefs(mChannel), mURI,
- iStream, NS_LITERAL_CSTRING("text/html"),
- NS_LITERAL_CSTRING("utf-8"), size);
-+#endif
- if (NS_FAILED(rv)) return rv;
-
- return rv;
@@ -401,7 +408,7 @@
}
diff --git a/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp b/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp
deleted file mode 100644
index cf3e67efd757..000000000000
--- a/www/galeon2/files/patch-mozilla_mozilla-embed-persist.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- mozilla/mozilla-embed-persist.cpp.orig Thu Feb 13 16:18:30 2003
-+++ mozilla/mozilla-embed-persist.cpp Thu Feb 13 16:20:25 2003
-@@ -16,6 +16,10 @@
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include "mozilla-embed-persist.h"
- #include "mozilla-embed.h"
- #include "ProgressListener.h"
-@@ -235,7 +239,11 @@
- persist,
- !(flags & EMBED_PERSIST_SHOW_PROGRESS));
-
-+#if MOZILLA_SNAPSHOT > 3
-+ rv = bpersist->SaveURI (linkURI, nsnull, nsnull, nsnull, nsnull, file);
-+#else
- rv = bpersist->SaveURI (linkURI, nsnull, file);
-+#endif
- if (NS_FAILED(rv)) return G_FAILED;
- }
-
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 7ea3450c2d1a..ad07e76b5844 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -30,7 +30,6 @@ etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Netword/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security/%gconf.xml
@@ -82,6 +81,7 @@ share/gnome/galeon/galeon-separator.png
share/gnome/galeon/galeon-viewsource.png
share/gnome/galeon/galeon.glade
share/gnome/galeon/galeon.png
+share/gnome/galeon/gnu.png
share/gnome/galeon/google.png
share/gnome/galeon/google_groups.png
share/gnome/galeon/google_images.png
@@ -224,6 +224,7 @@ share/locale/sl/LC_MESSAGES/galeon-2.0.mo
share/locale/sv/LC_MESSAGES/galeon-2.0.mo
share/locale/ta/LC_MESSAGES/galeon-2.0.mo
share/locale/tr/LC_MESSAGES/galeon-2.0.mo
+share/locale/vi/LC_MESSAGES/galeon-2.0.mo
share/locale/uk/LC_MESSAGES/galeon-2.0.mo
share/locale/wa/LC_MESSAGES/galeon-2.0.mo
share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
@@ -263,7 +264,6 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Security
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Netword
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
generated by cgit (git 2.34.1) at 2024-12-24 08:36:24 +0800