cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 0.6.5, thanks to brad@ and naddy@

Browse Source
This commit is contained in:
couderc 2002-05-02 19:16:25 +00:00
parent 137e3a9d3a
commit 980d040150
9 changed files with 56 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
www/dillo/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.4 2002/04/20 01:39:53 pvalchev Exp $
# $OpenBSD: Makefile,v 1.5 2002/05/02 19:16:25 couderc Exp $
COMMENT= "Fast and light gtk-based web browser"
DISTNAME= dillo-0.6.4
DISTNAME= dillo-0.6.5
CATEGORIES= www
NEED_VERSION= 1.508
NEED_VERSION= 1.525
HOMEPAGE= http://dillo.cipsga.org.br/
MAINTAINER= Damien Couderc <couderc.damien@wanadoo.fr>
MAINTAINER= Damien Couderc <couderc@openbsd.org>
# GPL license
PERMIT_PACKAGE_CDROM= Yes
@ -25,8 +25,8 @@ LIB_DEPENDS= jpeg.62::graphics/jpeg \
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-jpeg-inc=${LOCALBASE}/include \
--with-jpeg-lib=${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dillo

6
www/dillo/distinfo
View File

@ -1,3 +1,3 @@
MD5 (dillo-0.6.4.tar.gz) = e578f1922ee69658e42167a561362d37
RMD160 (dillo-0.6.4.tar.gz) = a5248fd804f1fb514e291df2822b4f746451d67d
SHA1 (dillo-0.6.4.tar.gz) = 0613724628b084713946bbd4f38805ba31c8ea44
MD5 (dillo-0.6.5.tar.gz) = e36cd8b36aa7e9a926d1c470904f8bdf
RMD160 (dillo-0.6.5.tar.gz) = 7cfa02bf0d3710a3386fde22d5c1767ef82d580f
SHA1 (dillo-0.6.5.tar.gz) = 34e11b573e577d24fc20a2b8a9a13f44883ecf51

34
www/dillo/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2002/03/18 14:31:20 couderc Exp $
--- configure.orig Tue Jan 29 20:01:53 2002
+++ configure Sat Mar 16 17:50:49 2002
@@ -2544,7 +2544,7 @@ done
$OpenBSD: patch-configure,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- configure.orig Thu May 2 20:46:17 2002
+++ configure Thu May 2 20:46:43 2002
@@ -2557,7 +2557,7 @@ done
# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
rm -f conftest.err conftest.$ac_ext
if $ac_preproc_ok; then
@ -10,29 +10,3 @@ $OpenBSD: patch-configure,v 1.1.1.1 2002/03/18 14:31:20 couderc Exp $
fi
done
@@ -2707,13 +2707,13 @@ if test "x$jpeg_ok" = "xno"; then
echo "$as_me: WARNING: *** JPEG support will not be included ***" >&2;}
fi
-echo "$as_me:2710: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+echo "$as_me:2710: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 2718 "configure"
#include "confdefs.h"
@@ -2761,7 +2761,7 @@ if test $ac_cv_lib_pthread_pthread_creat
#define HAVE_LIBPTHREAD 1
EOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
fi

28
www/dillo/patches/patch-src_IO_http_c
View File

@ -1,16 +1,7 @@
$OpenBSD: patch-src_IO_http_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
--- src/IO/http.c.orig Thu Jan 24 07:00:04 2002
+++ src/IO/http.c Mon Apr 1 19:03:49 2002
@@ -189,7 +189,7 @@ static gboolean
{
ChainLink *Info;
SocketData_t *S;
- gint SKey = (gint) data;
+ gint SKey = GPOINTER_TO_INT(data);
DEBUG_MSG(3, "Http_use_socket: %s [errno %d] [GIOcond %d]\n",
g_strerror(errno), errno, cond);
@@ -230,7 +230,7 @@ static int Http_connect_socket(ChainLink
$OpenBSD: patch-src_IO_http_c,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- src/IO/http.c.orig Wed Apr 10 03:10:36 2002
+++ src/IO/http.c Wed May 1 15:20:41 2002
@@ -237,7 +237,7 @@ static int Http_connect_socket(ChainLink
{
gint status;
struct sockaddr_in name;
@ -19,7 +10,7 @@ $OpenBSD: patch-src_IO_http_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
/* Some OSes require this... */
memset(&name, 0, sizeof(name));
@@ -324,7 +324,7 @@ static gint Http_get(ChainLink *Info, vo
@@ -332,7 +332,7 @@ static gint Http_get(ChainLink *Info, vo
{
void *link;
const DilloUrl *Url = Data;
@ -28,7 +19,7 @@ $OpenBSD: patch-src_IO_http_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
gchar hostname[256], *Host = hostname;
/* Reference Info data */
@@ -369,14 +369,14 @@ static gint Http_get(ChainLink *Info, vo
@@ -377,7 +377,7 @@ static gint Http_get(ChainLink *Info, vo
void
a_Http_ccc(int Op, int Branch, ChainLink *Info, void *Data, void *ExtraData)
{
@ -37,11 +28,12 @@ $OpenBSD: patch-src_IO_http_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
SocketData_t *S = a_Klist_get_data(ValidSocks, SKey);
if ( Branch == 1 ) {
/* DNS query branch */
@@ -385,7 +385,7 @@ void
switch (Op) {
case OpStart:
- Info->LocalKey = (void *) SKey = Http_sock_new();
+ Info->LocalKey = GINT_TO_POINTER(SKey) = Http_sock_new();
SKey = Http_sock_new();
- Info->LocalKey = (void *) SKey;
+ Info->LocalKey = GPOINTER_TO_INT(SKey);
if (Http_get(Info, Data, ExtraData) < 0) {
DEBUG_MSG(2, " HTTP: new abort handler! #2\n");
S = a_Klist_get_data(ValidSocks, SKey);

23
www/dillo/patches/patch-src_dillo_c
View File

@ -1,24 +1,15 @@
$OpenBSD: patch-src_dillo_c,v 1.1.1.1 2002/03/18 14:31:20 couderc Exp $
--- src/dillo.c.orig Sun Jan 20 19:18:58 2002
+++ src/dillo.c Thu Mar 14 16:09:56 2002
@@ -45,6 +45,7 @@
#include "interface.h"
$OpenBSD: patch-src_dillo_c,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- src/dillo.c.orig Mon Mar 18 16:02:50 2002
+++ src/dillo.c Wed May 1 15:29:09 2002
@@ -46,6 +46,7 @@
#include "dw.h"
#include "dw_widget.h"
#include "cookies.h"
+#include "debug.h"
/*
@@ -67,7 +68,7 @@ gint main(int argc, char *argv[])
* todo: implement a cleaner mechanism (in file.c) */
signal(SIGPIPE, SIG_IGN);
- g_print("Setting locale to %s\n", gtk_set_locale());
+ DEBUG_MSG(3, "Setting locale to %s\n", gtk_set_locale());
gtk_init(&argc, &argv);
gdk_rgb_init();
@@ -132,7 +133,7 @@ gint main(int argc, char *argv[])
@@ -136,7 +137,7 @@ gint main(int argc, char *argv[])
a_Dw_freeall();
a_History_free();
@ -27,7 +18,7 @@ $OpenBSD: patch-src_dillo_c,v 1.1.1.1 2002/03/18 14:31:20 couderc Exp $
return 0;
}
@@ -146,10 +147,10 @@ static void Dillo_check_home_dir(char *d
@@ -150,10 +151,10 @@ static void Dillo_check_home_dir(char *d
if ( stat(dir, &st) == -1 ) {
if ( errno == ENOENT && mkdir(dir, 0700) < 0 ) {

10
www/dillo/patches/patch-src_dns_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_dns_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
--- src/dns.c.orig Mon Apr 1 19:05:25 2002
+++ src/dns.c Mon Apr 1 19:05:32 2002
$OpenBSD: patch-src_dns_c,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- src/dns.c.orig Wed May 1 15:57:15 2002
+++ src/dns.c Wed May 1 16:04:04 2002
@@ -208,7 +208,7 @@ void a_Dns_init(void)
dns_server[i].hostname = NULL;
dns_server[i].timeout_id = -1;
#ifdef G_DNS_THREADED
- dns_server[i].th1 = -1;
+ dns_server[i].th1 = GINT_TO_POINTER(-1);
- dns_server[i].th1 = (pthread_t) -1;
+ dns_server[i].th1 = GPOINTER_TO_INT((pthread_t) -1);
#endif
}
}

18
www/dillo/patches/patch-src_dw_style_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
--- src/dw_style.c.orig Mon Apr 1 18:53:40 2002
+++ src/dw_style.c Mon Apr 1 18:55:26 2002
@@ -655,7 +655,7 @@ DwStyleColor* a_Dw_style_color_new (gint
$OpenBSD: patch-src_dw_style_c,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- src/dw_style.c.orig Fri Apr 5 17:18:19 2002
+++ src/dw_style.c Wed May 1 14:48:35 2002
@@ -657,7 +657,7 @@ DwStyleColor* a_Dw_style_color_new (gint
{
DwStyleColor *color;
@ -10,7 +10,7 @@ $OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
if (color == NULL) {
color = g_new (DwStyleColor, 1);
color->ref_count = 0;
@@ -663,7 +663,7 @@ DwStyleColor* a_Dw_style_color_new (gint
@@ -665,7 +665,7 @@ DwStyleColor* a_Dw_style_color_new (gint
Dw_style_color_create (color_val, window,
&color->color, &color->gc, 0);
@ -19,7 +19,7 @@ $OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
}
return color;
@@ -674,7 +674,7 @@ DwStyleColor* a_Dw_style_color_new (gint
@@ -676,7 +676,7 @@ DwStyleColor* a_Dw_style_color_new (gint
*/
static void Dw_style_color_remove (DwStyleColor *color)
{
@ -28,7 +28,7 @@ $OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
gdk_gc_destroy (color->gc);
g_free (color);
}
@@ -689,7 +689,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
@@ -691,7 +691,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
{
DwStyleShadedColor *color;
@ -37,7 +37,7 @@ $OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
if (color == NULL) {
color = g_new (DwStyleShadedColor, 1);
color->ref_count = 0;
@@ -701,7 +701,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
@@ -703,7 +703,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
&color->color_dark, &color->gc_dark, -1);
Dw_style_color_create (color_val, window,
&color->color_light, &color->gc_light, +1);
@ -46,7 +46,7 @@ $OpenBSD: patch-src_dw_style_c,v 1.1 2002/04/02 02:28:00 pvalchev Exp $
}
return color;
@@ -712,7 +712,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
@@ -714,7 +714,7 @@ DwStyleShadedColor* a_Dw_style_shaded_co
*/
static void Dw_style_shaded_color_remove (DwStyleShadedColor *color)
{

20
www/dillo/patches/patch-src_nav_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-src_nav_c,v 1.1.1.1 2002/03/18 14:31:20 couderc Exp $
--- src/nav.c.orig Thu Mar 14 15:19:54 2002
+++ src/nav.c Thu Mar 14 15:22:08 2002
@@ -82,7 +82,7 @@ static void Nav_open_url(BrowserWindow *
a_Interface_stop(bw);
a_Interface_clean(bw);
$OpenBSD: patch-src_nav_c,v 1.2 2002/05/02 19:16:25 couderc Exp $
--- src/nav.c.orig Wed Apr 10 03:10:16 2002
+++ src/nav.c Wed May 1 14:58:16 2002
@@ -154,7 +154,7 @@ static void Nav_open_url(BrowserWindow *
DilloWeb *Web;
gboolean ForceReload = (URL_FLAGS(url) & URL_E2EReload);
- g_print("Nav_open_url: Url=>%s<\n", URL_STR(url));
+ DEBUG_MSG(3, "Nav_open_url: Url=>%s<\n", URL_STR(url));
a_Menu_pagemarks_new(bw);
- g_print("Nav_open_url: Url=>%s<\n", URL_STR_(url));
+ DEBUG_MSG(3, "Nav_open_url: Url=>%s<\n", URL_STR_(url));
/* Get the url of the current page */
if ( a_Nav_stack_ptr(bw) != -1 )

2
www/dillo/pkg/DESCR
View File

@ -2,3 +2,5 @@ Dillo is a graphical web browser that's completely written in C,
very fast, small in code and binary. It basically depends on GTK+,
and renders a good subset of HTML, frames are managed same as lynx,
no jvm, no javascript.
WWW: ${HOMEPAGE}