1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-23 20:51:43 +00:00

Update to 1.3.16. The list of changes can be found at

http://galeon.sourceforge.net/news/index.php#83.
This commit is contained in:
Joe Marcus Clarke 2004-07-03 21:07:27 +00:00
parent 6bd1512b96
commit 5a9135fcb9
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=112872
7 changed files with 54 additions and 49 deletions

View File

@ -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}"

View File

@ -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

View File

@ -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'

View File

@ -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);

View File

@ -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

View File

@ -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))
{

View File

@ -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