From owner-svn-ports-branches@freebsd.org Sun Jan 22 08:38:14 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3CC86CBA322; Sun, 22 Jan 2017 08:38:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 179659C4; Sun, 22 Jan 2017 08:38:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0M8cDUS014454; Sun, 22 Jan 2017 08:38:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0M8cDQ9014452; Sun, 22 Jan 2017 08:38:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201701220838.v0M8cDQ9014452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 22 Jan 2017 08:38:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r432099 - in branches/2017Q1/editors: openoffice-4/files openoffice-devel/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 08:38:14 -0000 Author: jbeich Date: Sun Jan 22 08:38:12 2017 New Revision: 432099 URL: https://svnweb.freebsd.org/changeset/ports/432099 Log: MFH: r432098 editors/openoffice-devel: unbreak with clang 4.0 main/desktop/source/app/officeipcthread.cxx:228:14: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int') if ( handle > 0 ) ~~~~~~ ^ ~ main/desktop/source/deployment/misc/dp_misc.cxx:106:16: error: ordered comparison between pointer and zero ('rtlDigest' (aka 'void *') and 'int') if (digest <= 0) { ~~~~~~ ^ ~ main/sd/source/ui/view/viewshe3.cxx:229:48: error: ordered comparison between pointer and zero ('SdPage *' and 'int') if (pDocument->GetSdPage(0, ePageKind) > 0) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~ PR: 216206 Submitted by: pfg Obtained from: upstream Approved by: ports-secteam blanket Added: branches/2017Q1/editors/openoffice-4/files/patch-clang40 - copied unchanged from r432098, head/editors/openoffice-4/files/patch-clang40 branches/2017Q1/editors/openoffice-devel/files/patch-clang40 - copied unchanged from r432098, head/editors/openoffice-devel/files/patch-clang40 Modified: Directory Properties: branches/2017Q1/ (props changed) Copied: branches/2017Q1/editors/openoffice-4/files/patch-clang40 (from r432098, head/editors/openoffice-4/files/patch-clang40) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/editors/openoffice-4/files/patch-clang40 Sun Jan 22 08:38:12 2017 (r432099, copy of r432098, head/editors/openoffice-4/files/patch-clang40) @@ -0,0 +1,39 @@ +Index: desktop/source/app/officeipcthread.cxx +=================================================================== +--- desktop/source/app/officeipcthread.cxx (revision 1779757) ++++ desktop/source/app/officeipcthread.cxx (revision 1779758) +@@ -225,7 +225,7 @@ String CreateMD5FromString( const OUString& aMsg ) + // BACK: Str "ababab....0f" Hexcode String + + rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if ( handle > 0 ) ++ if ( handle != NULL ) + { + const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr(); + sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); +Index: desktop/source/deployment/misc/dp_misc.cxx +=================================================================== +--- desktop/source/deployment/misc/dp_misc.cxx (revision 1779671) ++++ desktop/source/deployment/misc/dp_misc.cxx (revision 1779695) +@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () () + } + + rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if (digest <= 0) { ++ if (digest == NULL) { + throw RuntimeException( + OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); + } +Index: sd/source/ui/view/viewshe3.cxx +=================================================================== +--- sd/source/ui/view/viewshe3.cxx (revision 1779671) ++++ sd/source/ui/view/viewshe3.cxx (revision 1779695) +@@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( + // When the given page is NULL then use the first page of the document. + SdPage* pTemplatePage = pPage; + if (pTemplatePage == NULL) +- if (pDocument->GetSdPage(0, ePageKind) > 0) ++ if (pDocument->GetSdPage(0, ePageKind) != NULL) + pTemplatePage = pDocument->GetSdPage(0, ePageKind); + if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) + aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers(); Copied: branches/2017Q1/editors/openoffice-devel/files/patch-clang40 (from r432098, head/editors/openoffice-devel/files/patch-clang40) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2017Q1/editors/openoffice-devel/files/patch-clang40 Sun Jan 22 08:38:12 2017 (r432099, copy of r432098, head/editors/openoffice-devel/files/patch-clang40) @@ -0,0 +1,39 @@ +Index: desktop/source/app/officeipcthread.cxx +=================================================================== +--- desktop/source/app/officeipcthread.cxx (revision 1779757) ++++ desktop/source/app/officeipcthread.cxx (revision 1779758) +@@ -225,7 +225,7 @@ String CreateMD5FromString( const OUString& aMsg ) + // BACK: Str "ababab....0f" Hexcode String + + rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if ( handle > 0 ) ++ if ( handle != NULL ) + { + const sal_uInt8* pData = (const sal_uInt8*)aMsg.getStr(); + sal_uInt32 nSize = ( aMsg.getLength() * sizeof( sal_Unicode )); +Index: desktop/source/deployment/misc/dp_misc.cxx +=================================================================== +--- desktop/source/deployment/misc/dp_misc.cxx (revision 1779671) ++++ desktop/source/deployment/misc/dp_misc.cxx (revision 1779695) +@@ -103,7 +103,7 @@ const OUString OfficePipeId::operator () () + } + + rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); +- if (digest <= 0) { ++ if (digest == NULL) { + throw RuntimeException( + OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 ); + } +Index: sd/source/ui/view/viewshe3.cxx +=================================================================== +--- sd/source/ui/view/viewshe3.cxx (revision 1779671) ++++ sd/source/ui/view/viewshe3.cxx (revision 1779695) +@@ -226,7 +226,7 @@ SdPage* ViewShell::CreateOrDuplicatePage ( + // When the given page is NULL then use the first page of the document. + SdPage* pTemplatePage = pPage; + if (pTemplatePage == NULL) +- if (pDocument->GetSdPage(0, ePageKind) > 0) ++ if (pDocument->GetSdPage(0, ePageKind) != NULL) + pTemplatePage = pDocument->GetSdPage(0, ePageKind); + if (pTemplatePage != NULL && pTemplatePage->TRG_HasMasterPage()) + aVisibleLayers = pTemplatePage->TRG_GetMasterPageVisibleLayers();