mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
Add patch from the sylpheed-claws CVS which is supposed to fix the build
issues on 4.x. Additionally add a bugfix (from CVS too). Submitted by: Chris Johnson <cjohnson@lextranet.com>
This commit is contained in:
Alexander Leidinger
parent
88b85a4203
commit
b7b5236680
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=136793
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= sylpheed-claws
|
||||
PORTVERSION= 1.9.11
|
||||
#PORTREVISION= 1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= mail news ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= sylpheed-claws
|
||||
|
||||
57
mail/claws-mail/files/patch-src-procmsg.c
Normal file
57
mail/claws-mail/files/patch-src-procmsg.c
Normal file
@ -0,0 +1,57 @@
|
||||
Index: src/procmsg.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
|
||||
retrieving revision 1.150.2.23
|
||||
retrieving revision 1.150.2.24
|
||||
diff -u -r1.150.2.23 -r1.150.2.24
|
||||
--- src/procmsg.c 30 Apr 2005 16:47:39 -0000 1.150.2.23
|
||||
+++ src/procmsg.c 19 May 2005 19:53:29 -0000 1.150.2.24
|
||||
@@ -662,13 +662,6 @@
|
||||
FILE *fp;
|
||||
int hnum;
|
||||
gchar buf[BUFFSIZE];
|
||||
-
|
||||
- g_return_val_if_fail(file != NULL, NULL);
|
||||
-
|
||||
- if ((fp = fopen(file, "rb")) == NULL) {
|
||||
- FILE_OP_ERROR(file, "fopen");
|
||||
- return NULL;
|
||||
- }
|
||||
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
|
||||
{"SSV:", NULL, FALSE},
|
||||
{"R:", NULL, FALSE},
|
||||
@@ -682,6 +675,13 @@
|
||||
{"X-Sylpheed-Encrypt:", NULL, FALSE},
|
||||
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
|
||||
{NULL, NULL, FALSE}};
|
||||
+
|
||||
+ g_return_val_if_fail(file != NULL, NULL);
|
||||
+
|
||||
+ if ((fp = fopen(file, "rb")) == NULL) {
|
||||
+ FILE_OP_ERROR(file, "fopen");
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
|
||||
!= -1) {
|
||||
|
||||
|
||||
Index: src/procmsg.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
|
||||
retrieving revision 1.150.2.24
|
||||
retrieving revision 1.150.2.25
|
||||
diff -u -r1.150.2.24 -r1.150.2.25
|
||||
--- src/procmsg.c 19 May 2005 19:53:29 -0000 1.150.2.24
|
||||
+++ src/procmsg.c 20 May 2005 16:24:11 -0000 1.150.2.25
|
||||
@@ -722,9 +722,9 @@
|
||||
cur = orig;
|
||||
while (cur) {
|
||||
gchar *file;
|
||||
+ PrefsAccount *ac = procmsg_get_account_from_file(file);
|
||||
msg = (MsgInfo *)cur->data;
|
||||
file = folder_item_fetch_msg(queue, msg->msgnum);
|
||||
- PrefsAccount *ac = procmsg_get_account_from_file(file);
|
||||
g_free(file);
|
||||
|
||||
if (last_account == NULL || (ac != NULL && ac == last_account)) {
|
||||
20
mail/claws-mail/files/patch-src-send_message.c
Normal file
20
mail/claws-mail/files/patch-src-send_message.c
Normal file
@ -0,0 +1,20 @@
|
||||
Index: src/send_message.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/send_message.c,v
|
||||
retrieving revision 1.17.2.9
|
||||
retrieving revision 1.17.2.10
|
||||
diff -u -r1.17.2.9 -r1.17.2.10
|
||||
--- src/send_message.c 30 Apr 2005 16:47:40 -0000 1.17.2.9
|
||||
+++ src/send_message.c 20 May 2005 16:24:12 -0000 1.17.2.10
|
||||
@@ -333,7 +333,8 @@
|
||||
* easier.
|
||||
*/
|
||||
if (!keep_session || ret != 0) {
|
||||
- smtp_quit(session);
|
||||
+ if (session_is_connected(session))
|
||||
+ smtp_quit(session);
|
||||
while (session_is_connected(session))
|
||||
gtk_main_iteration();
|
||||
session_destroy(session);
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= sylpheed-claws
|
||||
PORTVERSION= 1.9.11
|
||||
#PORTREVISION= 1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= mail news ipv6
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
|
||||
MASTER_SITE_SUBDIR= sylpheed-claws
|
||||
|
||||
57
mail/sylpheed-claws/files/patch-src-procmsg.c
Normal file
57
mail/sylpheed-claws/files/patch-src-procmsg.c
Normal file
@ -0,0 +1,57 @@
|
||||
Index: src/procmsg.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
|
||||
retrieving revision 1.150.2.23
|
||||
retrieving revision 1.150.2.24
|
||||
diff -u -r1.150.2.23 -r1.150.2.24
|
||||
--- src/procmsg.c 30 Apr 2005 16:47:39 -0000 1.150.2.23
|
||||
+++ src/procmsg.c 19 May 2005 19:53:29 -0000 1.150.2.24
|
||||
@@ -662,13 +662,6 @@
|
||||
FILE *fp;
|
||||
int hnum;
|
||||
gchar buf[BUFFSIZE];
|
||||
-
|
||||
- g_return_val_if_fail(file != NULL, NULL);
|
||||
-
|
||||
- if ((fp = fopen(file, "rb")) == NULL) {
|
||||
- FILE_OP_ERROR(file, "fopen");
|
||||
- return NULL;
|
||||
- }
|
||||
static HeaderEntry qentry[] = {{"S:", NULL, FALSE},
|
||||
{"SSV:", NULL, FALSE},
|
||||
{"R:", NULL, FALSE},
|
||||
@@ -682,6 +675,13 @@
|
||||
{"X-Sylpheed-Encrypt:", NULL, FALSE},
|
||||
{"X-Sylpheed-Encrypt-Data:", NULL, FALSE},
|
||||
{NULL, NULL, FALSE}};
|
||||
+
|
||||
+ g_return_val_if_fail(file != NULL, NULL);
|
||||
+
|
||||
+ if ((fp = fopen(file, "rb")) == NULL) {
|
||||
+ FILE_OP_ERROR(file, "fopen");
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, qentry))
|
||||
!= -1) {
|
||||
|
||||
|
||||
Index: src/procmsg.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/procmsg.c,v
|
||||
retrieving revision 1.150.2.24
|
||||
retrieving revision 1.150.2.25
|
||||
diff -u -r1.150.2.24 -r1.150.2.25
|
||||
--- src/procmsg.c 19 May 2005 19:53:29 -0000 1.150.2.24
|
||||
+++ src/procmsg.c 20 May 2005 16:24:11 -0000 1.150.2.25
|
||||
@@ -722,9 +722,9 @@
|
||||
cur = orig;
|
||||
while (cur) {
|
||||
gchar *file;
|
||||
+ PrefsAccount *ac = procmsg_get_account_from_file(file);
|
||||
msg = (MsgInfo *)cur->data;
|
||||
file = folder_item_fetch_msg(queue, msg->msgnum);
|
||||
- PrefsAccount *ac = procmsg_get_account_from_file(file);
|
||||
g_free(file);
|
||||
|
||||
if (last_account == NULL || (ac != NULL && ac == last_account)) {
|
||||
20
mail/sylpheed-claws/files/patch-src-send_message.c
Normal file
20
mail/sylpheed-claws/files/patch-src-send_message.c
Normal file
@ -0,0 +1,20 @@
|
||||
Index: src/send_message.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/sylpheed-claws/sylpheed-claws/src/send_message.c,v
|
||||
retrieving revision 1.17.2.9
|
||||
retrieving revision 1.17.2.10
|
||||
diff -u -r1.17.2.9 -r1.17.2.10
|
||||
--- src/send_message.c 30 Apr 2005 16:47:40 -0000 1.17.2.9
|
||||
+++ src/send_message.c 20 May 2005 16:24:12 -0000 1.17.2.10
|
||||
@@ -333,7 +333,8 @@
|
||||
* easier.
|
||||
*/
|
||||
if (!keep_session || ret != 0) {
|
||||
- smtp_quit(session);
|
||||
+ if (session_is_connected(session))
|
||||
+ smtp_quit(session);
|
||||
while (session_is_connected(session))
|
||||
gtk_main_iteration();
|
||||
session_destroy(session);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user