diff options
| author | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-23 14:51:06 +0100 |
| commit | 3352601e0860584509adf2b76f993d03893ded4b (patch) | |
| tree | 974fccc8c0eb2f5ad9d4ffd741dfc35869ed67b5 /make/lib/swt/gtk-linux-x86 | |
| parent | f51933f0ebe9ae030c26c066e59a728ce08b8559 (diff) | |
| parent | c67de337a8aaf52e36104c3f13e273aa19d21f1f (diff) | |
Merge branch 'master' into stash_glyphcache
Conflicts:
make/scripts/tests.sh
src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
src/jogl/classes/com/jogamp/graph/curve/Region.java
src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
src/jogl/classes/com/jogamp/graph/font/Font.java
src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java
Diffstat (limited to 'make/lib/swt/gtk-linux-x86')
| -rw-r--r-- | make/lib/swt/gtk-linux-x86/about.html | 4 | ||||
| -rw-r--r-- | make/lib/swt/gtk-linux-x86/about_files/about_cairo.html | 48 | ||||
| -rw-r--r-- | make/lib/swt/gtk-linux-x86/about_files/pixman-licenses.txt | 92 | ||||
| -rw-r--r-- | make/lib/swt/gtk-linux-x86/swt-debug.jar | bin | 2153399 -> 2276642 bytes |
4 files changed, 0 insertions, 144 deletions
diff --git a/make/lib/swt/gtk-linux-x86/about.html b/make/lib/swt/gtk-linux-x86/about.html index 6c5fbd8db..a6c15196b 100644 --- a/make/lib/swt/gtk-linux-x86/about.html +++ b/make/lib/swt/gtk-linux-x86/about.html @@ -176,10 +176,6 @@ Changes to the original files were made by SWT on April 7, 2009 and are marked w conditions of the Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided with the Content (<a href="about_files/mpl-v11.txt" target="_blank">mpl-v11.txt</a>) and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>.</p> -<h4>Cairo for Linux</h4> - -<p>Refer to the file <a href="about_files/about_cairo.html">about_files/about_cairo.html</a> for licensing details about "Cairo for Linux." - <h4>Independent JPEG Group's JPEG software release 6b</h4> <p>This software is based in part on the work of the Independent JPEG Group's JPEG software release 6b ("LIBJPEG"). diff --git a/make/lib/swt/gtk-linux-x86/about_files/about_cairo.html b/make/lib/swt/gtk-linux-x86/about_files/about_cairo.html deleted file mode 100644 index 013230775..000000000 --- a/make/lib/swt/gtk-linux-x86/about_files/about_cairo.html +++ /dev/null @@ -1,48 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<html> -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> -<body lang="EN-US"> -<h2>About This Content</h2> - -<p>March 27, 2006</p> -<h3>License</h3> - -<p>The Eclipse Foundation has included the following package for your convenience:</p> - -<h4>Cairo 1.0.2 for Linux</h4> - -<p>Cairo for Linux ("Cairo") is developed by The Cairo Project (<a href="http://www.cairographics.org" target="_blank">http://www.cairographics.org</a>):</p> - -<p>Cairo is delivered in the following file ("Cairo Library"):</p> -<ul> - <li>libcairo-swt.so</li> -</ul> - -<p>which was compiled from Cairo source code available at <a href="http://www.cairographics.org/snapshots" target="_blank">http://www.cairographics.org/snapshots</a>.</p> - -<p>Your use of the Cairo code in binary form is subject to -the terms and conditions of Mozilla Public License Version 1.1 ("MPL"). A copy of the MPL is provided (<a href="mpl-v11.txt" target="blank">mpl-v11.txt</a>) -and is also available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html" target="_blank">http://www.mozilla.org/MPL/MPL-1.1.html.</a> - -<h4>pixman 0.1.6</h4> - -<p>pixman ("pixman") is packaged within the Cairo Library and was compiled from source code available at -<a href="http://www.cairographics.org/snapshots" target="_blank">http://www.cairographics.org/snapshots</a>. -pixman includes the following packages:</p> - -<ul> - <li>libpixregion</li> - <li>libic</li> - <li>slim</li> -</ul> - -Your use of pixman is subject to the terms and conditions of the licenses in <a href="pixman-licenses.txt" target="blank">pixman-licenses.txt</a>.</p> - -<p>If you did not receive the Cairo Library directly from the Eclipse Foundation, the package is being redistributed by another party ("Redistributor") and different terms and conditions may -apply its use. Check the Redistributor's license that was provided with the content. If no such license exists, contact the Redistributor.</p> - -</body> -</html>
\ No newline at end of file diff --git a/make/lib/swt/gtk-linux-x86/about_files/pixman-licenses.txt b/make/lib/swt/gtk-linux-x86/about_files/pixman-licenses.txt deleted file mode 100644 index 5d8dca6d6..000000000 --- a/make/lib/swt/gtk-linux-x86/about_files/pixman-licenses.txt +++ /dev/null @@ -1,92 +0,0 @@ -libpixregion - -Copyright 1987, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not be -used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from The Open Group. - - -Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. - - All Rights Reserved - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Digital not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. - -DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR -ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, -WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, -ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - ----------------------------------------------------------------------- -libic - -Copyright � 2001 Keith Packard - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Keith Packard not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Keith Packard makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - ----------------------------------------------------------------------- -slim - -slim is Copyright � 2003 Richard Henderson - -Permission to use, copy, modify, distribute, and sell this software -and its documentation for any purpose is hereby granted without fee, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Richard Henderson not be -used in advertising or publicity pertaining to distribution of the -software without specific, written prior permission. Richard Henderson -makes no representations about the suitability of this software for -any purpose. It is provided "as is" without express or implied -warranty. - -RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF -USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR -OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - diff --git a/make/lib/swt/gtk-linux-x86/swt-debug.jar b/make/lib/swt/gtk-linux-x86/swt-debug.jar Binary files differindex 78a15196c..f99e4f424 100644 --- a/make/lib/swt/gtk-linux-x86/swt-debug.jar +++ b/make/lib/swt/gtk-linux-x86/swt-debug.jar |