summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/galeon/Makefile4
-rw-r--r--www/galeon/PLIST13
-rw-r--r--www/galeon/distinfo15
-rw-r--r--www/galeon/patches/patch-aa33
-rw-r--r--www/galeon/patches/patch-ab18
-rw-r--r--www/galeon/patches/patch-ad6
-rw-r--r--www/galeon/patches/patch-ae14
-rw-r--r--www/galeon/patches/patch-af20
-rw-r--r--www/galeon/patches/patch-ag17
-rw-r--r--www/galeon/patches/patch-ah17
10 files changed, 34 insertions, 123 deletions
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 70263149256..b8c02108187 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.73 2004/10/05 16:55:30 abs Exp $
+# $NetBSD: Makefile,v 1.74 2004/11/27 00:52:49 abs Exp $
#
-DISTNAME= galeon-1.3.17
+DISTNAME= galeon-1.3.18
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=galeon/}
EXTRACT_SUFX= .tar.bz2
diff --git a/www/galeon/PLIST b/www/galeon/PLIST
index d5bd309c763..a0e8bb5078e 100644
--- a/www/galeon/PLIST
+++ b/www/galeon/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/10/05 18:32:47 abs Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/11/27 00:52:49 abs Exp $
bin/galeon
bin/galeon-config-tool
lib/bonobo/servers/GNOME_Galeon_Automation.server
@@ -21,11 +21,12 @@ share/galeon/default-prefs.js
share/galeon/fetch_favicon.xpm
share/galeon/freshmeat.png
share/galeon/galeon-bookmark-alias-mark.png
-share/galeon/galeon-bookmark.png
share/galeon/galeon-default.png
share/galeon/galeon-download.png
share/galeon/galeon-egg-ui-toolbar.xml
share/galeon/galeon-egg-ui.xml
+share/galeon/galeon-entry.png
+share/galeon/galeon-filter.png
share/galeon/galeon-folder.png
share/galeon/galeon-history.png
share/galeon/galeon-insecure.png
@@ -159,6 +160,10 @@ share/gnome/help/galeon/es/other-tools.xml
share/gnome/help/galeon/es/plugins.xml
share/gnome/help/galeon/es/preface.xml
share/gnome/help/galeon/es/preferences.xml
+share/omf/galeon/galeon-C.omf
+share/omf/galeon/galeon-es.omf
+share/pixmaps/galeon.png
+share/sounds/galeon/clicked.wav
${PKGLOCALEDIR}/locale/am/LC_MESSAGES/galeon-2.0.mo
${PKGLOCALEDIR}/locale/az/LC_MESSAGES/galeon-2.0.mo
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/galeon-2.0.mo
@@ -209,10 +214,6 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/galeon-2.0.mo
${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/galeon-2.0.mo
${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
-share/omf/galeon/galeon-C.omf
-share/omf/galeon/galeon-es.omf
-share/pixmaps/galeon.png
-share/sounds/galeon/clicked.wav
@dirrm share/sounds/galeon
@comment in xdg-dirs: @dirrm share/sounds
@comment in xdg-dirs: @dirrm share/pixmaps
diff --git a/www/galeon/distinfo b/www/galeon/distinfo
index e36bb627855..98725356bd6 100644
--- a/www/galeon/distinfo
+++ b/www/galeon/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.38 2004/11/12 02:24:55 kristerw Exp $
+$NetBSD: distinfo,v 1.39 2004/11/27 00:52:49 abs Exp $
-SHA1 (galeon-1.3.17.tar.bz2) = 03bb667acbf61eeca98ae5f39ddf1713ee18246b
-Size (galeon-1.3.17.tar.bz2) = 3635524 bytes
-SHA1 (patch-aa) = f90eceea62d12ebcaed72d8b8871cf35eda51256
-SHA1 (patch-ab) = 2bea5878588c98b66c31dd5b7eda63912fe9ff1d
+SHA1 (galeon-1.3.18.tar.bz2) = 7a6c539e18e209c2ba7c50cf9529d86525088425
+Size (galeon-1.3.18.tar.bz2) = 3866453 bytes
+SHA1 (patch-aa) = 708aff2a72a8795aa29c5aaa475063b9de572733
SHA1 (patch-ac) = 9f5b88e605c846d566615322cb1cc21ff585028a
-SHA1 (patch-ad) = 5f125f07451cbd7969cba6c254d7a5bd6ae00788
-SHA1 (patch-ae) = 054715c68a1a278331e9e20be107b0e1717b08f6
-SHA1 (patch-af) = efd03db05288d755c88c91c42beec08fadb54430
-SHA1 (patch-ag) = 78d396e16f19932f8f867c78cb552683af88b048
-SHA1 (patch-ah) = 4df96d586cae1e1671b077cee636bacd1ec78c02
+SHA1 (patch-ad) = 7b42615c65372ade81fa983e572eb8bfd130d60a
diff --git a/www/galeon/patches/patch-aa b/www/galeon/patches/patch-aa
index eeb0acf90cc..933b156fc82 100644
--- a/www/galeon/patches/patch-aa
+++ b/www/galeon/patches/patch-aa
@@ -1,19 +1,20 @@
-$NetBSD: patch-aa,v 1.12 2004/10/05 16:54:29 abs Exp $
+$NetBSD: patch-aa,v 1.13 2004/11/27 00:52:49 abs Exp $
---- configure.in.orig 2004-08-07 21:42:52.000000000 +0100
-+++ configure.in
-@@ -213,12 +213,12 @@ AC_ARG_WITH(mozilla-snapshot,
- AC_MSG_RESULT($MOZILLA_VERSION$autodetect)
+--- mozilla/MozillaPrivate.cpp.orig 2004-11-27 00:10:16.000000000 +0000
++++ mozilla/MozillaPrivate.cpp
+@@ -109,6 +109,7 @@ NS_METHOD MozillaPrintSettingsToEmbedPri
+ tmp = paperPrefix + NS_LITERAL_CSTRING("width_mm");
+ rv = pref->GetIntPref(tmp.get(), &width);
- dnl Test for the "trunk" version
--if test $MOZILLA_VERSION == "trunk"; then
-+if test $MOZILLA_VERSION = "trunk"; then
- MOZILLA_VERSION=99.0 # use a high number
- fi
-
- dnl Split up the version string ( 1.7rc1 -> 1 7 rc 1 )
--version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@\+\|@<:@a-z@:>@\+\)/\1 /g' -e 's/\.//g')
-+version=$(echo $MOZILLA_VERSION | sed -e 's/\(@<:@0-9@:>@*\)/\1 /g' -e 's/\.//g')
-
- set -- $version;
++#ifdef _NL_PAPER_HEIGHT
+ // mark locale default paper size so that print dialog can use
+ // it as best guess when switching printers
+ if (height == (int) (long int) nl_langinfo (_NL_PAPER_HEIGHT) &&
+@@ -116,6 +117,7 @@ NS_METHOD MozillaPrintSettingsToEmbedPri
+ {
+ info->paper = i;
+ }
++#endif
+ PRBool is_inch;
+ tmp = paperPrefix + NS_LITERAL_CSTRING("is_inch");
diff --git a/www/galeon/patches/patch-ab b/www/galeon/patches/patch-ab
deleted file mode 100644
index 3593fb8bfd4..00000000000
--- a/www/galeon/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2004/10/05 16:54:29 abs Exp $
-
---- configure.orig 2004-08-08 21:12:00.000000000 +0100
-+++ configure
-@@ -22744,11 +22744,11 @@ fi;
- echo "$as_me:$LINENO: result: $MOZILLA_VERSION$autodetect" >&5
- echo "${ECHO_T}$MOZILLA_VERSION$autodetect" >&6
-
--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 's/\([0-9]*\)/\1 /g' -e 's/\.//g')
-
- set -- $version;
-
diff --git a/www/galeon/patches/patch-ad b/www/galeon/patches/patch-ad
index 4c9048e1108..d56c5909041 100644
--- a/www/galeon/patches/patch-ad
+++ b/www/galeon/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2004/10/05 16:54:29 abs Exp $
+$NetBSD: patch-ad,v 1.5 2004/11/27 00:52:49 abs Exp $
---- sounds/Makefile.in.orig 2004-08-08 21:12:13.000000000 +0100
+--- sounds/Makefile.in.orig 2004-10-23 18:21:35.000000000 +0100
+++ sounds/Makefile.in
-@@ -232,7 +232,8 @@ sharedstatedir = @sharedstatedir@
+@@ -231,7 +231,8 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
galeon_SOUNDS = clicked.wav
diff --git a/www/galeon/patches/patch-ae b/www/galeon/patches/patch-ae
deleted file mode 100644
index 32f21b23fe1..00000000000
--- a/www/galeon/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2004/10/05 16:54:29 abs Exp $
-
---- mozilla/mozilla-embed.cpp.orig 2004-10-05 13:03:37.000000000 +0100
-+++ mozilla/mozilla-embed.cpp
-@@ -1388,7 +1388,8 @@ impl_set_encoding (GaleonEmbed *embed,
- rv = wrapper->ForceEncoding (charset);
- if (NS_FAILED (rv)) return G_FAILED;
-
--#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3)
-+#if MOZILLA_CHECK_VERSION4 (1,8,MOZILLA_ALPHA,3) || \
-+ (MOZILLA_IS_BRANCH (1,7) && MOZILLA_CHECK_VERSION3(1,7,3))
- gtk_moz_embed_reload (GTK_MOZ_EMBED (embed),
- GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE);
- #else
diff --git a/www/galeon/patches/patch-af b/www/galeon/patches/patch-af
deleted file mode 100644
index 988d537ed0e..00000000000
--- a/www/galeon/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.3 2004/11/12 02:24:55 kristerw Exp $
-
---- libegg/egg-toolbar-editor.c.orig Fri Nov 12 03:05:07 2004
-+++ libegg/egg-toolbar-editor.c Fri Nov 12 03:05:42 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/galeon/patches/patch-ag b/www/galeon/patches/patch-ag
deleted file mode 100644
index fcc71e4c640..00000000000
--- a/www/galeon/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/11/12 02:24:55 kristerw Exp $
-
---- src/popup-commands.c.orig Fri Nov 12 03:16:45 2004
-+++ src/popup-commands.c Fri Nov 12 03:17:08 2004
-@@ -333,11 +333,11 @@
- GaleonPopup *popup)
- {
- GaleonEmbed *embed;
-+ char *location;
-
- embed = galeon_popup_get_embed (popup);
- g_return_if_fail (GALEON_IS_EMBED (embed));
-
-- char *location;
- galeon_embed_get_location (embed, FALSE, FALSE, &location);
- popup_copy_to_clipboard (popup, location);
- g_free (location);
diff --git a/www/galeon/patches/patch-ah b/www/galeon/patches/patch-ah
deleted file mode 100644
index e9849770c63..00000000000
--- a/www/galeon/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2004/11/12 02:24:55 kristerw Exp $
-
---- src/galeon-encoding-dialog.c.orig Fri Nov 12 03:18:13 2004
-+++ src/galeon-encoding-dialog.c Fri Nov 12 03:18:38 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))
- {
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 17:33:01 +0000