diff options
author | marcus <marcus@FreeBSD.org> | 2002-12-03 04:16:25 +0000 |
---|---|---|
committer | marcus <marcus@FreeBSD.org> | 2002-12-03 04:16:25 +0000 |
commit | 82d1384bbb23a0d0debd0c52a9ea804fc0d412b2 (patch) | |
tree | 30b4da03daae38f9efb0159e08bdc9e76b4af030 | |
parent | 8829782d6c255cc2bf7c75c686ca05bc2ac0bbea (diff) | |
download | FreeBSD-ports-82d1384bbb23a0d0debd0c52a9ea804fc0d412b2.zip FreeBSD-ports-82d1384bbb23a0d0debd0c52a9ea804fc0d412b2.tar.gz |
Update to 0.5.6 which fixes some persistent crashes.
Submitted by: maintainer
Approved by: portmgr (kris)
-rw-r--r-- | www/screem-devel/Makefile | 2 | ||||
-rw-r--r-- | www/screem-devel/distinfo | 2 | ||||
-rw-r--r-- | www/screem-devel/files/patch-src_fileops.c | 31 | ||||
-rw-r--r-- | www/screem-devel/files/patch-src_screem-markup.c | 22 | ||||
-rw-r--r-- | www/screem/Makefile | 2 | ||||
-rw-r--r-- | www/screem/distinfo | 2 | ||||
-rw-r--r-- | www/screem/files/patch-src_fileops.c | 31 | ||||
-rw-r--r-- | www/screem/files/patch-src_screem-markup.c | 22 |
8 files changed, 48 insertions, 66 deletions
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile index f3836d0..6cbcbcb 100644 --- a/www/screem-devel/Makefile +++ b/www/screem-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= screem -PORTVERSION= 0.5.5 +PORTVERSION= 0.5.6 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.screem.org/src/ diff --git a/www/screem-devel/distinfo b/www/screem-devel/distinfo index cf2e54d..78aca26 100644 --- a/www/screem-devel/distinfo +++ b/www/screem-devel/distinfo @@ -1 +1 @@ -MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06 +MD5 (screem-0.5.6.tar.gz) = 6b580b7eb93703b017d4ba0a0e05d6d3 diff --git a/www/screem-devel/files/patch-src_fileops.c b/www/screem-devel/files/patch-src_fileops.c deleted file mode 100644 index d2db972..0000000 --- a/www/screem-devel/files/patch-src_fileops.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/fileops.c.orig Fri Sep 20 11:27:42 2002 -+++ src/fileops.c Fri Nov 15 03:46:00 2002 -@@ -144,6 +144,9 @@ - result = gnome_vfs_get_file_info( dest, vfsinfo, options ); - - if( result != GNOME_VFS_OK ) { -+ gnome_vfs_file_info_unref( vfsinfo ); -+ vfsinfo = gnome_vfs_file_info_new(); -+ gnome_vfs_get_file_info( source, vfsinfo, options ); - if( ! mkdir_recursive( dest, vfsinfo->permissions ) ) { - gnome_vfs_file_info_unref( vfsinfo ); - return FALSE; -@@ -159,7 +162,7 @@ - gnome_vfs_file_info_unref( vfsinfo ); - - handle = NULL; -- result = gnome_vfs_directory_open( &handle, dest, options ); -+ result = gnome_vfs_directory_open( &handle, source, options ); - - if( result != GNOME_VFS_OK ) { - return FALSE; -@@ -298,6 +301,9 @@ - result = GNOME_VFS_OK; - } - gnome_vfs_file_info_unref( info ); -+ } -+ else if ( result == GNOME_VFS_ERROR_IS_DIRECTORY ) { -+ result = GNOME_VFS_OK; - } - - ret = ( result == GNOME_VFS_OK ); diff --git a/www/screem-devel/files/patch-src_screem-markup.c b/www/screem-devel/files/patch-src_screem-markup.c new file mode 100644 index 0000000..9afe058 --- /dev/null +++ b/www/screem-devel/files/patch-src_screem-markup.c @@ -0,0 +1,22 @@ +--- src/screem-markup.c.orig Wed Nov 13 08:19:22 2002 ++++ src/screem-markup.c Sun Dec 1 21:57:23 2002 +@@ -778,7 +778,7 @@ + + GSList *screem_markup_get_links( ScreemDTD *dtd, const gchar *text ) + { +- GSList *ret; ++ GSList *ret, *attr, *tmp; + gchar *next; + gint pos; + gint end; +@@ -792,8 +792,8 @@ + NULL, &end, &name ) ) ) { + pos = end; + /* get tag attributes */ +- GSList *attr; +- GSList *tmp; ++ /* GSList *attr; */ ++ /* GSList *tmp; */ + + attr = screem_markup_build_attributes_list( next, NULL ); + diff --git a/www/screem/Makefile b/www/screem/Makefile index f3836d0..6cbcbcb 100644 --- a/www/screem/Makefile +++ b/www/screem/Makefile @@ -6,7 +6,7 @@ # PORTNAME= screem -PORTVERSION= 0.5.5 +PORTVERSION= 0.5.6 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.screem.org/src/ diff --git a/www/screem/distinfo b/www/screem/distinfo index cf2e54d..78aca26 100644 --- a/www/screem/distinfo +++ b/www/screem/distinfo @@ -1 +1 @@ -MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06 +MD5 (screem-0.5.6.tar.gz) = 6b580b7eb93703b017d4ba0a0e05d6d3 diff --git a/www/screem/files/patch-src_fileops.c b/www/screem/files/patch-src_fileops.c deleted file mode 100644 index d2db972..0000000 --- a/www/screem/files/patch-src_fileops.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/fileops.c.orig Fri Sep 20 11:27:42 2002 -+++ src/fileops.c Fri Nov 15 03:46:00 2002 -@@ -144,6 +144,9 @@ - result = gnome_vfs_get_file_info( dest, vfsinfo, options ); - - if( result != GNOME_VFS_OK ) { -+ gnome_vfs_file_info_unref( vfsinfo ); -+ vfsinfo = gnome_vfs_file_info_new(); -+ gnome_vfs_get_file_info( source, vfsinfo, options ); - if( ! mkdir_recursive( dest, vfsinfo->permissions ) ) { - gnome_vfs_file_info_unref( vfsinfo ); - return FALSE; -@@ -159,7 +162,7 @@ - gnome_vfs_file_info_unref( vfsinfo ); - - handle = NULL; -- result = gnome_vfs_directory_open( &handle, dest, options ); -+ result = gnome_vfs_directory_open( &handle, source, options ); - - if( result != GNOME_VFS_OK ) { - return FALSE; -@@ -298,6 +301,9 @@ - result = GNOME_VFS_OK; - } - gnome_vfs_file_info_unref( info ); -+ } -+ else if ( result == GNOME_VFS_ERROR_IS_DIRECTORY ) { -+ result = GNOME_VFS_OK; - } - - ret = ( result == GNOME_VFS_OK ); diff --git a/www/screem/files/patch-src_screem-markup.c b/www/screem/files/patch-src_screem-markup.c new file mode 100644 index 0000000..9afe058 --- /dev/null +++ b/www/screem/files/patch-src_screem-markup.c @@ -0,0 +1,22 @@ +--- src/screem-markup.c.orig Wed Nov 13 08:19:22 2002 ++++ src/screem-markup.c Sun Dec 1 21:57:23 2002 +@@ -778,7 +778,7 @@ + + GSList *screem_markup_get_links( ScreemDTD *dtd, const gchar *text ) + { +- GSList *ret; ++ GSList *ret, *attr, *tmp; + gchar *next; + gint pos; + gint end; +@@ -792,8 +792,8 @@ + NULL, &end, &name ) ) ) { + pos = end; + /* get tag attributes */ +- GSList *attr; +- GSList *tmp; ++ /* GSList *attr; */ ++ /* GSList *tmp; */ + + attr = screem_markup_build_attributes_list( next, NULL ); + |