From db578bfa3a13bf8588ea3a3e5f6dfb9c2f9a9e1d Mon Sep 17 00:00:00 2001 From: Rob Gill Date: Sun, 20 Jan 2019 18:00:30 +1000 Subject: [PATCH] apps/AboutSystem NetBSD licences and xfree86 url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Adds licence information for the NetBSD contributions * ftp - 4 clause BSD (retained in ftp.c) * tput - Berkeley (http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/tput/tput.c?rev=1.26) * Berkeley licence text added to licences * xfree86.org url added These were previously marked TODOs Change-Id: I01bf0bb6055b3b45ca80c6cddabdb093cb043408 Reviewed-on: https://review.haiku-os.org/c/887 Reviewed-by: Stephan Aßmus --- data/system/data/licenses/Berkeley | 27 +++++++++++++++++++++++++++ src/apps/aboutsystem/AboutSystem.cpp | 8 +++++--- 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 data/system/data/licenses/Berkeley diff --git a/data/system/data/licenses/Berkeley b/data/system/data/licenses/Berkeley new file mode 100644 index 0000000000..23dbe48295 --- /dev/null +++ b/data/system/data/licenses/Berkeley @@ -0,0 +1,27 @@ +Copyright (c) + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 78df90d618..7114e5cee9 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -92,6 +92,7 @@ static const rgb_color kLinkBlue = { 80, 80, 200, 255 }; static const rgb_color kBeOSBlue = { 0, 0, 200, 255 }; static const rgb_color kBeOSRed = { 200, 0, 0, 255 }; +static const char* kBerkeley = B_TRANSLATE_MARK("Berkeley"); static const char* kBSDTwoClause = B_TRANSLATE_MARK("BSD (2-clause)"); static const char* kBSDThreeClause = B_TRANSLATE_MARK("BSD (3-clause)"); static const char* kBSDFourClause = B_TRANSLATE_MARK("BSD (4-clause)"); @@ -1124,8 +1125,9 @@ AboutView::_CreateCreditsView() "ftp, tput\n" COPYRIGHT_STRING "1996-2008 The NetBSD Foundation, Inc. " "All rights reserved."), + StringVector(kBerkeley, kBSDFourClause, NULL), + StringVector(), "https://www.netbsd.org"); - // TODO: License! // FFmpeg copyrights _AddPackageCredit(PackageCredit("FFmpeg") @@ -1182,8 +1184,8 @@ AboutView::_CreateCreditsView() "Corporation, Maynard, Massachusetts.\n" "All rights reserved."), NULL) - .SetLicenses("OpenGroup", "DEC", NULL)); - // TODO: URL + .SetLicenses("OpenGroup", "DEC", NULL) + .SetURL("https://xfree86.org")); // Bitstream Charter font _AddPackageCredit(PackageCredit("Bitstream Charter font")