summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:59:33 +0000
committerplundblad@chromium.org <plundblad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:59:33 +0000
commit2ea858dc0382b2fcd1d99f175c5bad75996604f4 (patch)
tree5762d420d40c528d7f10348bb246e3201083c329
parent0c5aa5a7ff0e79f390bbf9a448f6c791c8ec2454 (diff)
downloadchromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.zip
chromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.tar.gz
chromium_src-2ea858dc0382b2fcd1d99f175c5bad75996604f4.tar.bz2
Add liblouis to third_party.
liblouis is a braille translation library that is used inside the ChromeVox extension, where it is included as a native client binary. This adjust the lincense check scripts for the headers used in this library. BUG=303795,316353 Review URL: https://codereview.chromium.org/35683004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234051 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--.gitignore1
-rw-r--r--DEPS5
-rwxr-xr-xthird_party/devscripts/licensecheck.pl4
-rw-r--r--third_party/liblouis/LICENSE27
-rw-r--r--third_party/liblouis/OWNERS4
-rw-r--r--third_party/liblouis/README.chromium18
6 files changed, 57 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 8b40107..a45b894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -228,6 +228,7 @@ v8.log
/third_party/libjingle/source
/third_party/libjingle/source_internal
/third_party/libjpeg_turbo
+/third_party/liblouis/src
/third_party/libmtp/
/third_party/libphonenumber/libphonenumber.xml
/third_party/libphonenumber/libphonenumber_without_metadata.xml
diff --git a/DEPS b/DEPS
index fb30d57..14741e7 100644
--- a/DEPS
+++ b/DEPS
@@ -459,6 +459,11 @@ deps_os = {
"src/third_party/undoview":
"/trunk/deps/third_party/undoview@119694",
+
+ "src/third_party/liblouis/src":
+ Var("chromium_git") +
+ "/external/liblouis.git@3c2daee56250162e5a75830871601d74328d39f5",
+
},
"android": {
"src/third_party/android_tools":
diff --git a/third_party/devscripts/licensecheck.pl b/third_party/devscripts/licensecheck.pl
index 28f471e..f7be5c5 100755
--- a/third_party/devscripts/licensecheck.pl
+++ b/third_party/devscripts/licensecheck.pl
@@ -444,7 +444,7 @@ sub parselicense($) {
}
if ($licensetext =~ /version ([^, ]+?)[.,]? (?:or later|or any later version) (?:of the GNU (?:Lesser |Library )General Public License )(as )?published by the Free Software Foundation/i or
- $licensetext =~ /GNU (?:Lesser |Library )General Public License (?:(?:as )?published by the Free Software Foundation;)?,? (?:either )?[Vv]ersion ([^, ]+?)(?: of the license)?[.,]? (?:or later|or (?:\(at your option\) )?any later version)/i or
+ $licensetext =~ /(?:GNU (?:Lesser |Library )|(?:Lesser|Library) GNU )General Public License (?:(?:as )?published by the Free Software Foundation;)?,? (?:either )?[Vv]ersion ([^, ]+?)(?: of the license)?[.,]? (?:or later|or (?:\(at your option\) )?any later version)/i or
$licensetext =~ /GNU (?:Lesser |Library )General Public License(?: \(LGPL\))?,? [Vv]ersion (\d+(?:\.\d+)?)[ \.]/) {
$lgplver = " (v$1 or later)";
}
@@ -458,7 +458,7 @@ sub parselicense($) {
}
if ($licensetext =~ /is (free software.? you can redistribute it and\/or modify it|licensed) under the terms of (version [^ ]+ of )?the (GNU (Library |Lesser )General Public License|LGPL)/i or
- $licensetext =~ /(is distributed|may be used).*terms.*LGPL/) {
+ $licensetext =~ /(is distributed|may be used|can redistribute).*terms.*(LGPL|(Lesser|Library) GNU General Public License)/) {
if ($lgplver) {
$license = "LGPL$lgplver$extrainfo $license";
} else {
diff --git a/third_party/liblouis/LICENSE b/third_party/liblouis/LICENSE
new file mode 100644
index 0000000..f579d29
--- /dev/null
+++ b/third_party/liblouis/LICENSE
@@ -0,0 +1,27 @@
+(Copied from liblouis/liblouis.h)
+
+/* liblouis Braille Translation and Back-Translation Library
+
+ Based on the Linux screenreader BRLTTY, copyright (C) 1999-2006 by
+ The BRLTTY Team
+
+ Copyright (C) 2004, 2005, 2006, 2009 ViewPlus Technologies, Inc.
+ www.viewplus.com and JJB Software, Inc. www.jjb-software.com
+
+ liblouis is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as
+ published by the Free Software Foundation, either version 3 of the
+ License, or (at your option) any later version.
+
+ liblouis is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/>.
+
+ Maintained by John J. Boyer john.boyer@abilitiessoft.com
+ */
+
diff --git a/third_party/liblouis/OWNERS b/third_party/liblouis/OWNERS
new file mode 100644
index 0000000..dfab84a
--- /dev/null
+++ b/third_party/liblouis/OWNERS
@@ -0,0 +1,4 @@
+aboxhall@chromium.org
+dmazzoni@chromium.org
+dtseng@chromium.org
+plundblad@chromium.org
diff --git a/third_party/liblouis/README.chromium b/third_party/liblouis/README.chromium
new file mode 100644
index 0000000..866732a
--- /dev/null
+++ b/third_party/liblouis/README.chromium
@@ -0,0 +1,18 @@
+Name: Braille Translation Library
+Short Name: liblouis
+URL: http://liblouis.googlecode.com/svn/tags/liblouis_2_5_1
+Version: 2.5.1
+License: LGPL3
+License File: LICENSE
+Security Critical: yes
+
+Description:
+Liblouis is an open-source braille translator and back-translator. It
+features support for computer and literary braille, and supports
+contracted and uncontracted translation for many languages.
+
+libloius is used in a native client binary in ChromeVox and not linked into
+Chrome itself.
+
+Local Modifications:
+...