[Libreoffice-commits] core.git: configure.ac readlicense_oo/license
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 28 14:20:23 UTC 2019
configure.ac | 6 +++---
readlicense_oo/license/LICENSE | 4 ++--
readlicense_oo/license/LICENSE.fodt | 4 ++--
readlicense_oo/license/LICENSE.html | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ef28740d0ae036f6fa2e9866cadf335e9f0ad8b9
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Jan 25 15:46:22 2019 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jan 28 15:19:52 2019 +0100
It's called libatomic_ops not libatomic-ops
cf. <https://github.com/ivmai/libatomic_ops/> (as mentioned in
external/libatomic_ops/README)
Change-Id: Ibd50ca81695cbcd73e005b0bbbd46ceb62b1e9dc
Reviewed-on: https://gerrit.libreoffice.org/66912
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/configure.ac b/configure.ac
index 16666c887612..f80716445395 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8879,16 +8879,16 @@ int fb_api_is_30(void) { return 0; }
else
dnl Embedded Firebird has version 3.0
AC_DEFINE(HAVE_FIREBIRD_30, 1)
- dnl We need libatomic-ops for any non X86/X64 system
+ dnl We need libatomic_ops for any non X86/X64 system
if test "${CPUNAME}" != INTEL -a "${CPUNAME}" != X86_64; then
dnl ===================================================================
- dnl Check for system libatomic-ops
+ dnl Check for system libatomic_ops
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([libatomic_ops],[ATOMIC_OPS],[atomic_ops >= 0.7.2])
if test "$with_system_libatomic_ops" = "yes"; then
SYSTEM_LIBATOMIC_OPS=TRUE
AC_CHECK_HEADERS(atomic_ops.h, [],
- [AC_MSG_ERROR(atomic_ops.h not found. install libatomic-ops)], [])
+ [AC_MSG_ERROR(atomic_ops.h not found. install libatomic_ops)], [])
else
SYSTEM_LIBATOMIC_OPS=
LIBATOMIC_OPS_CFLAGS="-I${WORKDIR}/UnpackedTarball/libatomic_ops/include"
diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE
index 42f7df4e8f1b..cae07236b293 100644
--- a/readlicense_oo/license/LICENSE
+++ b/readlicense_oo/license/LICENSE
@@ -930,9 +930,9 @@ libassuan
See GNU Lesser General Public License Version 2.1 below
See GNU General Public License Version 3 below
-libatomic-ops
+libatomic_ops
- The following software may be included in this product: libatomic-ops.
+ The following software may be included in this product: libatomic_ops.
Use of any of this software is governed by the terms of the license
below:
diff --git a/readlicense_oo/license/LICENSE.fodt b/readlicense_oo/license/LICENSE.fodt
index a04019e4d88d..f243fb9d8b04 100644
--- a/readlicense_oo/license/LICENSE.fodt
+++ b/readlicense_oo/license/LICENSE.fodt
@@ -3546,8 +3546,8 @@
<text:p text:style-name="Standard">Alternatively, the acknowledgment may be graphical using the logos available at <text:a xlink:type="simple" xlink:href="http://www.jdom.org/images/logos" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/images/logos</text:a>.</text:p>
<text:p text:style-name="Standard">THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JDOM AUTHORS OR THE PROJECT 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.</text:p>
<text:p text:style-name="Standard">This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter <jhunter_AT_jdom_DOT_org> and Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information on the JDOM Project, please see <text:a xlink:type="simple" xlink:href="http://www.jdom.org/" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.jdom.org/</text:a>.</text:p>
- <text:h text:style-name="P95" text:outline-level="2">libatomic-ops</text:h>
- <text:p text:style-name="P43">The following software may be included in this product: <text:span text:style-name="T24">libatomic-ops</text:span>. Use of any of this software is governed by the terms of the license below:</text:p>
+ <text:h text:style-name="P95" text:outline-level="2">libatomic_ops</text:h>
+ <text:p text:style-name="P43">The following software may be included in this product: <text:span text:style-name="T24">libatomic_ops</text:span>. Use of any of this software is governed by the terms of the license below:</text:p>
<text:p text:style-name="P43"><text:a xlink:type="simple" xlink:href="#7.GNU General Public License Version 2|outline" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">Jump to GPL Version 2</text:a></text:p>
<text:h text:style-name="P96" text:outline-level="2">libcdr</text:h>
<text:p text:style-name="Standard">The following software may be included in this product: libcdr. Use of any of this software is governed by the terms of the license below:</text:p>
diff --git a/readlicense_oo/license/LICENSE.html b/readlicense_oo/license/LICENSE.html
index 52e24b8a2284..4af04dbc45bb 100644
--- a/readlicense_oo/license/LICENSE.html
+++ b/readlicense_oo/license/LICENSE.html
@@ -115,4 +115,4 @@
.Variable { font-style:italic; }
<!-- ODF styles with no properties representable as CSS -->
.Sect1 .T4 { }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list