1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Update to 0.5.6 which fixes some persistent crashes.

Submitted by:	maintainer
Approved by:	portmgr (kris)
This commit is contained in:
Joe Marcus Clarke 2002-12-03 04:16:25 +00:00
parent 674c7a07da
commit 26fc672156
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=71333
8 changed files with 48 additions and 66 deletions

View File

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

View File

@ -1 +1 @@
MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06
MD5 (screem-0.5.6.tar.gz) = 6b580b7eb93703b017d4ba0a0e05d6d3

View File

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

View File

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

View File

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

View File

@ -1 +1 @@
MD5 (screem-0.5.5.tar.gz) = eb9490829479fac6dff406b02b75ae06
MD5 (screem-0.5.6.tar.gz) = 6b580b7eb93703b017d4ba0a0e05d6d3

View File

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

View File

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