From 6ec1d5637b6f3075148663c3e5cc173339021352 Mon Sep 17 00:00:00 2001 From: Jose Alonso Cardenas Marquez Date: Tue, 6 Nov 2018 18:08:37 +0000 Subject: [PATCH] - Fix build on 12-BETA3 Reported by: pkg-fallout --- www/sogo4/Makefile | 1 + ...-MailPartViewers_UIxMailPartSignedViewer.m | 25 ++++++++----------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/www/sogo4/Makefile b/www/sogo4/Makefile index f7ea5c43cc30..9d8dc1a60345 100644 --- a/www/sogo4/Makefile +++ b/www/sogo4/Makefile @@ -2,6 +2,7 @@ PORTNAME= sogo4 PORTVERSION= 4.0.4 +PORTREVISION= 1 CATEGORIES= www gnustep MASTER_SITES= http://www.sogo.nu/files/downloads/SOGo/Sources/ DISTNAME= SOGo-${PORTVERSION} diff --git a/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m b/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m index e4df7d400a18..507a2be2ec9c 100644 --- a/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m +++ b/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m @@ -1,21 +1,18 @@ ---- UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-04 23:25:20.140369000 -0500 -+++ UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-04 23:28:00.684899000 -0500 -@@ -173,15 +173,15 @@ +--- UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-10-23 14:22:36.000000000 -0500 ++++ UI/MailPartViewers/UIxMailPartSignedViewer.m 2018-11-06 13:02:05.090224000 -0500 +@@ -169,13 +169,13 @@ + if (err) + { + #ifdef HAVE_GNUTLS +- const char* sslError; ++ NSString* sslError; ERR_load_crypto_strings(); SSL_load_error_strings(); 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 - const char* sslError; +- const char* sslError; ++ NSString* sslError; ERR_load_crypto_strings(); SSL_load_error_strings(); 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 */ - } - }