From owner-svn-ports-head@freebsd.org Fri Aug 28 17:36:56 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8E78D3B9575; Fri, 28 Aug 2020 17:36:56 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BdRc83J4Zz400g; Fri, 28 Aug 2020 17:36:56 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5519F18892; Fri, 28 Aug 2020 17:36:56 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07SHaukf096219; Fri, 28 Aug 2020 17:36:56 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07SHateo096216; Fri, 28 Aug 2020 17:36:55 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202008281736.07SHateo096216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 28 Aug 2020 17:36:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546765 - head/editors/codelite/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/editors/codelite/files X-SVN-Commit-Revision: 546765 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Aug 2020 17:36:56 -0000 Author: tcberner Date: Fri Aug 28 17:36:55 2020 New Revision: 546765 URL: https://svnweb.freebsd.org/changeset/ports/546765 Log: editors/codelite: fix build on recent current Added: head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp (contents, props changed) head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp (contents, props changed) head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp (contents, props changed) Added: head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_MySqlDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/MySqlDbAdapter.cpp.orig 2020-08-28 17:23:13 UTC ++++ DatabaseExplorer/MySqlDbAdapter.cpp +@@ -210,7 +210,7 @@ bool MySqlDbAdapter::GetColumns(Table* pTab) + { + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(wxT("")); + +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("SHOW COLUMNS IN `%s`.`%s`"),pTab->GetParentName().c_str(),pTab->GetName().c_str())); Added: head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_PostgreSqlDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/PostgreSqlDbAdapter.cpp.orig 2020-08-28 17:27:12 UTC ++++ DatabaseExplorer/PostgreSqlDbAdapter.cpp +@@ -307,7 +307,7 @@ bool PostgreSqlDbAdapter::GetColumns(Table* pTab) { + // SetDatabase(pTab->GetParentName()); + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(pTab->GetParentName()); + +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + //DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("SHOW COLUMNS IN `%s`.`%s`"),pTab->getParentName().c_str(),pTab->getName().c_str())); Added: head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-DatabaseExplorer_SqliteDbAdapter.cpp Fri Aug 28 17:36:55 2020 (r546765) @@ -0,0 +1,11 @@ +--- DatabaseExplorer/SqliteDbAdapter.cpp.orig 2020-08-28 17:30:30 UTC ++++ DatabaseExplorer/SqliteDbAdapter.cpp +@@ -122,7 +122,7 @@ bool SQLiteDbAdapter::GetColumns(Table* pTab) { + int i = 0; + DatabaseLayerPtr dbLayer = this->GetDatabaseLayer(wxT("")); + if (dbLayer) { +- if (!dbLayer->IsOpen()) return NULL; ++ if (!dbLayer->IsOpen()) return false; + // loading columns + //TODO:SQL: + DatabaseResultSet *database = dbLayer->RunQueryWithResults(wxString::Format(wxT("PRAGMA table_info('%s')"),pTab->GetName().c_str()));