diff options
author | marcus <marcus@FreeBSD.org> | 2004-07-04 05:07:27 +0800 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2004-07-04 05:07:27 +0800 |
commit | 83c068164b78e112a19f7d5f6c1cb627c5f9a29f (patch) | |
tree | 0ef40e7e6c90f46846aff5219e076cdfe6202812 /www | |
parent | 1041140fce82b913e1a6fd300c40cb082df58e45 (diff) | |
download | freebsd-ports-graphics-83c068164b78e112a19f7d5f6c1cb627c5f9a29f.tar.gz freebsd-ports-graphics-83c068164b78e112a19f7d5f6c1cb627c5f9a29f.tar.zst freebsd-ports-graphics-83c068164b78e112a19f7d5f6c1cb627c5f9a29f.zip |
Update to 1.3.16. The list of changes can be found at
http://galeon.sourceforge.net/news/index.php#83.
Diffstat (limited to 'www')
-rw-r--r-- | www/galeon2/Makefile | 11 | ||||
-rw-r--r-- | www/galeon2/distinfo | 4 | ||||
-rw-r--r-- | www/galeon2/files/patch-configure | 24 | ||||
-rw-r--r-- | www/galeon2/files/patch-libegg_egg-toolbar-editor.c | 18 | ||||
-rw-r--r-- | www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp | 29 | ||||
-rw-r--r-- | www/galeon2/files/patch-src_galeon-encoding-dialog.c | 15 | ||||
-rw-r--r-- | www/galeon2/pkg-plist | 2 |
7 files changed, 54 insertions, 49 deletions
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index 37d988d61a3..8cefcd20c65 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= galeon2 -PORTVERSION= 1.3.15 -PORTREVISION= 1 +PORTVERSION= 1.3.16 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://osdn.dl.sourceforge.net/sourceforge/galeon/ @@ -20,8 +19,6 @@ COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine) BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7" - MOZILLA= mozilla HEADERS_SUFX= @@ -32,7 +29,6 @@ HEADERS_SUFX= .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a" .else MOZILLA= mozilla HEADERS_SUFX= @@ -42,14 +38,13 @@ HEADERS_SUFX= WRKSRC= ${WRKDIR}/${PORTNAME:S/2$//}-${PORTVERSION:S/a$//} USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui +USE_GNOME= gnomeprefix lthack intlhack gnomehack libgnomeui USE_LIBTOOL_VER=13 USE_GMAKE= yes USE_REINPLACE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \ - --enable-nautilus-view=no \ - ${MOZ_CONFIGURE_ARGS} + --enable-nautilus-view=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo index b09f8dc672e..237f90ad893 100644 --- a/www/galeon2/distinfo +++ b/www/galeon2/distinfo @@ -1,2 +1,2 @@ -MD5 (galeon-1.3.15.tar.bz2) = 9334cbdf0734f626470e788ce37d21a6 -SIZE (galeon-1.3.15.tar.bz2) = 3641265 +MD5 (galeon-1.3.16.tar.bz2) = 539f8c4672a7e7448745f35110ec1529 +SIZE (galeon-1.3.16.tar.bz2) = 3572080 diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure index 747da60f545..d627d9d0e18 100644 --- a/www/galeon2/files/patch-configure +++ b/www/galeon2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Jun 1 13:57:51 2004 -+++ configure Tue Jun 1 13:58:33 2004 -@@ -1706,30 +1706,7 @@ +--- configure.orig Sat Jul 3 16:37:01 2004 ++++ configure Sat Jul 3 16:40:21 2004 +@@ -1705,30 +1705,7 @@ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi @@ -31,11 +31,17 @@ for ac_prog in gawk mawk nawk awk do -@@ -19101,6 +19078,7 @@ +@@ -22732,11 +22709,11 @@ + echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5 + echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6 - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS +-if test $MOZILLA_VERSION == "trunk"; then ++if test $MOZILLA_VERSION = "trunk"; then + MOZILLA_VERSION=99.0 # use a high number + fi + +-version=$(echo $MOZILLA_VERSION | sed -e 's/\([0-9]\+\|[a-z]\+\)/\1 /g' -e 's/\.//g') ++version=$(echo $MOZILLA_VERSION | sed -E -e 's/([0-9]+|[a-z]+)/\1 /g' -e 's/\.//g') + + set -- $version; - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/www/galeon2/files/patch-libegg_egg-toolbar-editor.c b/www/galeon2/files/patch-libegg_egg-toolbar-editor.c new file mode 100644 index 00000000000..e0a4fa1e36c --- /dev/null +++ b/www/galeon2/files/patch-libegg_egg-toolbar-editor.c @@ -0,0 +1,18 @@ +--- libegg/egg-toolbar-editor.c.orig Sat Jul 3 16:37:44 2004 ++++ libegg/egg-toolbar-editor.c Sat Jul 3 16:38:00 2004 +@@ -102,12 +102,12 @@ + static gint + compare_actions (gconstpointer a, gconstpointer b) + { +- g_return_val_if_fail (GTK_IS_ACTION (a), 0); +- g_return_val_if_fail (GTK_IS_ACTION (b), 0); +- + GValue value_a = { 0, }, value_b = { 0, }; + const char *short_label_a, *short_label_b; + int ret; ++ ++ g_return_val_if_fail (GTK_IS_ACTION (a), 0); ++ g_return_val_if_fail (GTK_IS_ACTION (b), 0); + + g_value_init (&value_a, G_TYPE_STRING); + g_object_get_property (G_OBJECT (a), "short_label", &value_a); diff --git a/www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp b/www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp deleted file mode 100644 index d9dc5c141f3..00000000000 --- a/www/galeon2/files/patch-mozilla_GtkNSSKeyPairDialogs.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- mozilla/GtkNSSKeyPairDialogs.cpp.orig Sun Jun 27 20:41:07 2004 -+++ mozilla/GtkNSSKeyPairDialogs.cpp Sun Jun 27 20:47:09 2004 -@@ -84,7 +84,7 @@ - NS_DECL_ISUPPORTS - NS_DECL_NSIDOMWINDOWINTERNAL - NS_DECL_NSIDOMWINDOW --#if MOZILLA_SNAPSHOT > 17 -+#if MOZILLA_SNAPSHOT > 15 - NS_DECL_NSIDOMWINDOW2 - #endif - -@@ -94,7 +94,7 @@ - gboolean close_called; - }; - --#if MOZILLA_SNAPSHOT > 17 -+#if MOZILLA_SNAPSHOT > 15 - NS_IMPL_ISUPPORTS3(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow, nsIDOMWindow2) - #else - NS_IMPL_ISUPPORTS2(KeyPairHelperWindow, nsIDOMWindowInternal, nsIDOMWindow) -@@ -242,7 +242,7 @@ - MOZ_NOT_IMPLEMENTED - } - --#if MOZILLA_SNAPSHOT > 17 -+#if MOZILLA_SNAPSHOT > 15 - NS_IMETHODIMP KeyPairHelperWindow::GetWindowRoot(nsIDOMEventTarget * *aEvent) - { - MOZ_NOT_IMPLEMENTED diff --git a/www/galeon2/files/patch-src_galeon-encoding-dialog.c b/www/galeon2/files/patch-src_galeon-encoding-dialog.c new file mode 100644 index 00000000000..674069940d4 --- /dev/null +++ b/www/galeon2/files/patch-src_galeon-encoding-dialog.c @@ -0,0 +1,15 @@ +--- src/galeon-encoding-dialog.c.orig Sat Jul 3 16:45:02 2004 ++++ src/galeon-encoding-dialog.c Sat Jul 3 16:45:11 2004 +@@ -282,10 +282,10 @@ + tree_view_selection_changed_cb (GtkTreeSelection *selection, + GaleonEncodingDialog *dialog) + { +- if (dialog->priv->update_tag == TRUE) return; +- + GtkTreeModel *model; + GtkTreeIter iter; ++ ++ if (dialog->priv->update_tag == TRUE) return; + + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist index 92df317a6c1..62fd32e42dd 100644 --- a/www/galeon2/pkg-plist +++ b/www/galeon2/pkg-plist @@ -26,6 +26,7 @@ share/gnome/galeon/freshmeat.png share/gnome/galeon/galeon-bookmark-alias-mark.png share/gnome/galeon/galeon-bookmark.png share/gnome/galeon/galeon-default.png +share/gnome/galeon/galeon-download.png share/gnome/galeon/galeon-egg-ui-toolbar.xml share/gnome/galeon/galeon-egg-ui.xml share/gnome/galeon/galeon-folder.png @@ -68,7 +69,6 @@ share/gnome/galeon/slack.png share/gnome/galeon/smart-bm-fold.png share/gnome/galeon/smart-bm-unfold.png share/gnome/galeon/stocks.png -share/gnome/galeon/toolbar-editor.glade share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml share/gnome/help/galeon/C/apx-authors.xml share/gnome/help/galeon/C/apx-bugs.xml |