mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00
Code Issues Releases Activity

- Fix build on 12-BETA3

Browse Source 
Reported by:	pkg-fallout
This commit is contained in:
Jose Alonso Cardenas Marquez 2018-11-06 18:08:37 +00:00
parent 155fdd8a0b
commit 6ec1d5637b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=484315
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/sogo4/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= sogo4 PORTNAME= sogo4
PORTVERSION= 4.0.4 PORTVERSION= 4.0.4
PORTREVISION= 1
CATEGORIES= www gnustep CATEGORIES= www gnustep
MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/
DISTNAME= SOGo-${PORTVERSION} DISTNAME= SOGo-${PORTVERSION}

25
www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
View File

@ -1,21 +1,18 @@
--- UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-04 23:25:20.140369000 -0500 --- UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-10-23 14:22:36.000000000 -0500
+++ UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-04 23:28:00.684899000 -0500 +++ UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-06 13:02:05.090224000 -0500
@@ -173,15 +173,15 @@ @@ -169,13 +169,13 @@
if (err)
{
#ifdef HAVE_GNUTLS
- const char* sslError;
+ NSString* sslError;
ERR_load_crypto_strings(); ERR_load_crypto_strings();
SSL_load_error_strings(); SSL_load_error_strings();
sslError = ERR_reason_error_string(err); sslError = ERR_reason_error_string(err);
- validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain]; validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
+ validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "No error information available"]] retain];
#elif OPENSSL_VERSION_NUMBER < 0x10100000L #elif OPENSSL_VERSION_NUMBER < 0x10100000L
const char* sslError; - const char* sslError;
+ NSString* sslError;
ERR_load_crypto_strings(); ERR_load_crypto_strings();
SSL_load_error_strings(); SSL_load_error_strings();
sslError = ERR_reason_error_string(err); sslError = ERR_reason_error_string(err);
- validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
+ validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "No error information available"]] retain];
#else
- validationMessage = [[self labelForKey: @"No error information available"] retain];
+ validationMessage = [[self labelForKey: "No error information available"] retain];
#endif /* HAVE_GNUTLS */
}
}