summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/skipstone/Makefile6
-rw-r--r--www/skipstone/PLIST4
-rw-r--r--www/skipstone/distinfo14
-rw-r--r--www/skipstone/patches/patch-aa66
-rw-r--r--www/skipstone/patches/patch-ab8
-rw-r--r--www/skipstone/patches/patch-ac11
-rw-r--r--www/skipstone/patches/patch-ad30
7 files changed, 82 insertions, 57 deletions
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index f04f1a7fa99..932bb24c1fe 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/08/09 14:17:16 rh Exp $
+# $NetBSD: Makefile,v 1.3 2002/01/24 13:47:02 wiz Exp $
#
-DISTNAME= skipstone-0.7.4
+DISTNAME= skipstone-0.7.8
CATEGORIES= www
MASTER_SITES= http://www.muhri.net/skipstone/
@@ -9,7 +9,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.muhri.net/skipstone/
COMMENT= Gtk+ web browser that embeds Mozilla's renderer
-DEPENDS+= mozilla>=0.9:../../www/mozilla
+DEPENDS+= mozilla>=0.9.7:../../www/mozilla
USE_GMAKE= yes
diff --git a/www/skipstone/PLIST b/www/skipstone/PLIST
index 696bed5aba1..da199f30dca 100644
--- a/www/skipstone/PLIST
+++ b/www/skipstone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:51 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/24 13:47:02 wiz Exp $
bin/skipstone
bin/skipstone-bin
bin/skipdownload
@@ -7,6 +7,8 @@ share/skipstone/pixmaps/default/config.xpm
share/skipstone/pixmaps/default/forward.xpm
share/skipstone/pixmaps/default/home.xpm
share/skipstone/pixmaps/default/logo.xpm
+share/skipstone/pixmaps/default/mini_folder.xpm
+share/skipstone/pixmaps/default/mini_link.xpm
share/skipstone/pixmaps/default/reload.xpm
share/skipstone/pixmaps/default/stop.xpm
@dirrm share/skipstone/pixmaps/default
diff --git a/www/skipstone/distinfo b/www/skipstone/distinfo
index 76e2a83afe4..4ade3729eb5 100644
--- a/www/skipstone/distinfo
+++ b/www/skipstone/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/08/09 14:17:17 rh Exp $
+$NetBSD: distinfo,v 1.3 2002/01/24 13:47:02 wiz Exp $
-SHA1 (skipstone-0.7.4.tar.gz) = 49c7962dad50a9a382eba67f5cdca68881544e88
-Size (skipstone-0.7.4.tar.gz) = 451953 bytes
-SHA1 (patch-aa) = 641de1030195280b81fe6d940b72e004cec0e7a5
-SHA1 (patch-ab) = 82dc54fe4c1d084a846e2c5245acdaaecb2c8ea6
-SHA1 (patch-ac) = 47579c822dda858eec4330cb1da2f8ffdd331eec
-SHA1 (patch-ad) = e8c424287f4c46298d6a3e976b4176a3f44c8d40
+SHA1 (skipstone-0.7.8.tar.gz) = 71fd1856746913b352572b4458727b25999c4975
+Size (skipstone-0.7.8.tar.gz) = 357255 bytes
+SHA1 (patch-aa) = 2261397de3d0be57b6af41986456cf46ed5ac6e6
+SHA1 (patch-ab) = 0ce631832790a2fd2e243c75ddf466aad337ec2e
+SHA1 (patch-ac) = 5df3314d4d2d9f23f64795c4a72a86765b4a6b4d
+SHA1 (patch-ad) = 0476574e5165030d1a4589ed28c8445444e99384
diff --git a/www/skipstone/patches/patch-aa b/www/skipstone/patches/patch-aa
index c0c134f5622..e5973d40b7b 100644
--- a/www/skipstone/patches/patch-aa
+++ b/www/skipstone/patches/patch-aa
@@ -1,30 +1,74 @@
-$NetBSD: patch-aa,v 1.2 2001/08/09 14:17:18 rh Exp $
+$NetBSD: patch-aa,v 1.3 2002/01/24 13:47:03 wiz Exp $
---- config.mk.orig Fri Jul 13 19:25:24 2001
+--- config.mk.orig Fri Dec 28 23:27:52 2001
+++ config.mk
-@@ -1,17 +1,12 @@
+@@ -1,54 +1,8 @@
-PREFIX=/usr/local
+#PREFIX=/usr/local
PLUGINDIR=$(HOME)/.skipstone/plugins
MOZILLA_INCLUDES = \
- -I/usr/include/mozilla \
-- -I/usr/local/include/mozilla \
+ -I$(PREFIX)/include/mozilla \
- -I/usr/include/nspr \
-- -I/usr/local/include/nspr \
+- -I/usr/include/mozilla/dom \
+- -I/usr/include/mozilla/windowwatcher \
+- -I/usr/include/mozilla/webbrowserpersist \
+- -I/usr/include/mozilla/appcomps \
+- -I/usr/include/mozilla/find \
+- -I/usr/include/mozilla/txtsvc \
+- -I/usr/include/mozilla/docshell \
+- -I/usr/include/mozilla/shistory \
+- -I/usr/include/mozilla/webshell \
+- -I/usr/include/mozilla/gfx \
+- -I/usr/include/mozilla/necko \
+- -I/usr/include/mozilla/widget \
+- -I/usr/include/mozilla/content \
+- -I/usr/include/mozilla/layout \
+- -I/usr/include/mozilla/browser \
+- -I/usr/include/mozilla/webbrwsr \
+- -I/usr/include/mozilla/string \
+- -I/usr/include/mozilla/xpcom \
+- -I/usr/include/mozilla/pref \
+- -I/usr/include/mozilla/gtkembedmoz \
- -I/usr/include/mozilla/nspr \
-- -I/usr/local/include/mozilla/nspr
-+ -I${X11PREFIX}/include/mozilla/nspr \
-+ -I${X11PREFIX}/include/mozilla
+- -I/usr/include/mozilla/uconv \
+- -I/usr/local/include/nspr \
+- -I/usr/local/include/mozilla/gtkembedmoz \
+- -I/usr/local/include/mozilla/dom \
+- -I/usr/local/include/mozilla/windowwatcher \
+- -I/usr/local/include/mozilla/appcomps \
+- -I/usr/local/include/mozilla/find \
+- -I/usr/local/include/mozilla/txtsvc \
+- -I/usr/local/include/mozilla/docshell \
+- -I/usr/local/include/mozilla/shistory \
+- -I/usr/local/include/mozilla/webshell \
+- -I/usr/local/include/mozilla/gfx \
+- -I/usr/include/mozilla/webbrowserpersist \
+- -I/usr/local/include/mozilla/necko \
+- -I/usr/local/include/mozilla/widget \
+- -I/usr/local/include/mozilla/content \
+- -I/usr/local/include/mozilla/layout \
+- -I/usr/local/include/mozilla/browser \
+- -I/usr/local/include/mozilla/webbrwsr \
+- -I/usr/local/include/mozilla/string \
+- -I/usr/local/include/mozilla/xpcom \
+- -I/usr/local/include/mozilla/pref \
+- -I/usr/local/include/mozilla/uconv \
+ -I$(PREFIX)/include/mozilla/nspr \
+ -I$(PREFIX)/include/mozilla/gtkembedmoz \
+ -I$(PREFIX)/include/mozilla/dom \
+@@ -73,8 +27,7 @@
+ -I$(PREFIX)/include/mozilla/uconv \
MOZILLA_LIBS = \
- -L/usr/lib/mozilla \
-- -L/usr/local/lib/mozilla \
-+ -L${X11PREFIX}/lib/mozilla -Wl,-R${X11PREFIX}/lib/mozilla \
+- -L$(PREFIX)/lib/mozilla \
++ -L$(PREFIX)/lib/mozilla -Wl,-R${PREFIX}/lib/mozilla \
-lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom
GTK_LIBS = $(shell gtk-config --libs)
-@@ -21,6 +16,7 @@
+@@ -84,6 +37,7 @@
CXX = g++
CPPFLAGS = $(GTK_INCLUDES) $(MOZILLA_INCLUDES)
diff --git a/www/skipstone/patches/patch-ab b/www/skipstone/patches/patch-ab
index cfb8a61730a..97ac39944da 100644
--- a/www/skipstone/patches/patch-ab
+++ b/www/skipstone/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
+$NetBSD: patch-ab,v 1.2 2002/01/24 13:47:03 wiz Exp $
---- src/skipstone.h.orig Mon Jul 2 21:41:31 2001
-+++ src/skipstone.h Mon Jul 2 21:43:48 2001
-@@ -38,6 +38,11 @@
+--- src/skipstone.h.orig Fri Dec 28 23:27:53 2001
++++ src/skipstone.h
+@@ -40,6 +40,11 @@
#define SKIPSTONE_SYSTEM_THEME_DIR "/usr/share/skipstone/pixmaps"
#define SKIPSTONE_LOCAL_PLUGIN_DIR "/usr/local/share/skipstone/plugins"
#define SKIPSTONE_SYSTEM_PLUGIN_DIR "/usr/share/skipstone/plugins"
diff --git a/www/skipstone/patches/patch-ac b/www/skipstone/patches/patch-ac
index 506eaa4c234..a22901be427 100644
--- a/www/skipstone/patches/patch-ac
+++ b/www/skipstone/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
+$NetBSD: patch-ac,v 1.2 2002/01/24 13:47:03 wiz Exp $
---- src/skipstone.orig Tue Jan 16 21:16:06 2001
-+++ src/skipstone Mon Jul 2 21:43:48 2001
-@@ -1,26 +1,3 @@
+--- src/skipstone.orig Fri Dec 28 23:27:52 2001
++++ src/skipstone
+@@ -1,29 +1,3 @@
-#!/bin/bash
-if test -n "$MOZILLA_FIVE_HOME"; then
- LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$LD_LIBRARY_PATH
@@ -18,6 +18,9 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
-elif [ -f /usr/local/lib/mozilla/libgtkembedmoz.so ]; then
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/mozilla
- export MOZILLA_FIVE_HOME=/usr/local/lib/mozilla
+-elif [ -f /opt/mozilla/libgtkembedmoz.so ]; then
+- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/mozilla
+- export MOZILLA_FIVE_HOME=/opt/mozilla
-else
-
-echo "Please set your MOZILLA_FIVE_HOME and LD_LIBRARY_PATH manually as I could not find them"
diff --git a/www/skipstone/patches/patch-ad b/www/skipstone/patches/patch-ad
index 478b6deb33d..6a49fde10ed 100644
--- a/www/skipstone/patches/patch-ad
+++ b/www/skipstone/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
+$NetBSD: patch-ad,v 1.2 2002/01/24 13:47:03 wiz Exp $
---- src/mozilla.cpp.orig Thu Jul 19 15:01:42 2001
-+++ src/mozilla.cpp Thu Aug 9 17:09:07 2001
+--- src/mozilla.cpp.orig Fri Dec 28 23:27:52 2001
++++ src/mozilla.cpp
@@ -3,6 +3,7 @@
* *
* released under the GPL */
@@ -10,27 +10,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/08/09 07:56:24 simonb Exp $
#include <gtk/gtk.h>
#include <sys/types.h>
-@@ -121,7 +122,11 @@
- if (NS_FAILED(rv) || !ds) return NS_ERROR_FAILURE;
- nsCOMPtr<nsIDocShellHistory> dsHistory = do_QueryInterface (ds);
- if (!dsHistory) return NS_ERROR_FAILURE;
-+#ifdef NS_WITH_SERVICE
- NS_WITH_SERVICE(nsIGlobalHistory, history, NS_GLOBALHISTORY_CONTRACTID, &rv);
-+#else
-+ nsCOMPtr < nsIGlobalHistory > history = do_GetService(NS_GLOBALHISTORY_CONTRACTID, &rv);
-+#endif
- if (history) dsHistory->SetGlobalHistory(history);
- return rv;
- }
-@@ -176,7 +181,11 @@
- {
-
- nsresult result = FALSE;
-+#ifdef NS_WITH_SERVICE
- NS_WITH_SERVICE(nsIPrintOptions, options, kPrintOptionsCID, &result);
-+#else
-+ nsCOMPtr < nsIPrintOptions > options = do_GetService(kPrintOptionsCID, &result);
-+#endif
- if (NS_FAILED(result)) return NS_ERROR_FAILURE;
-
- if (info->Pages)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 19:47:39 +0000