upload libcdr 0.1.6
Change-Id: I569f8ed92358982edbc419a6b687652ffd4fcb14 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88236 Tested-by: Jenkins Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon
@@ -17,8 +17,8 @@ export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz
|
||||
export CAIRO_SHA256SUM := 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
|
||||
export CAIRO_VERSION_MICRO := 0
|
||||
export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
|
||||
export CDR_SHA256SUM := 6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
|
||||
export CDR_TARBALL := libcdr-0.1.5.tar.xz
|
||||
export CDR_SHA256SUM := 01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861
|
||||
export CDR_TARBALL := libcdr-0.1.6.tar.xz
|
||||
export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
|
||||
export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
|
||||
export LIBCMIS_SHA256SUM := d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
|
||||
|
||||
33
external/libcdr/0001-Add-missing-include.patch.1
vendored
33
external/libcdr/0001-Add-missing-include.patch.1
vendored
@@ -1,33 +0,0 @@
|
||||
From 00c4b331df8157dff7c251323d00ec2d63691dfb Mon Sep 17 00:00:00 2001
|
||||
From: Miklos Vajna <vmiklos@collabora.com>
|
||||
Date: Mon, 28 Jan 2019 09:04:56 +0100
|
||||
Subject: [PATCH] Add missing include
|
||||
|
||||
CMXParser.cpp:42:43: error: expected ')'
|
||||
CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
|
||||
^
|
||||
CMXParser.cpp:42:19: note: to match this '('
|
||||
CDR_DEBUG_MSG(("invalid tag length %" PRIu16 "\n", tagLength));
|
||||
^
|
||||
1 error generated.
|
||||
|
||||
Change-Id: I9575a96327a62dc6c44950d35a8740242e1a4433
|
||||
---
|
||||
src/lib/CMXParser.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/lib/CMXParser.cpp b/src/lib/CMXParser.cpp
|
||||
index 78cc417..02852c9 100644
|
||||
--- a/src/lib/CMXParser.cpp
|
||||
+++ b/src/lib/CMXParser.cpp
|
||||
@@ -14,6 +14,7 @@
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include <utility>
|
||||
+#include <cinttypes>
|
||||
|
||||
#include "libcdr_utils.h"
|
||||
#include "CDRPath.h"
|
||||
--
|
||||
2.21.0
|
||||
|
||||
6
external/libcdr/UnpackedTarball_libcdr.mk
vendored
6
external/libcdr/UnpackedTarball_libcdr.mk
vendored
@@ -15,14 +15,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libcdr))
|
||||
|
||||
# * external/libcdr/0001-Add-missing-include.patch.1 is from upstream master (see content for
|
||||
# details);
|
||||
# * external/libcdr/ubsan.patch is upstream at <https://gerrit.libreoffice.org/#/c/73182/> "Avoid UB
|
||||
# converting from double to int via unsigned":
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
|
||||
external/libcdr/libcdr-visibility-win.patch \
|
||||
external/libcdr/0001-Add-missing-include.patch.1 \
|
||||
external/libcdr/ubsan.patch \
|
||||
))
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
64
external/libcdr/ubsan.patch
vendored
64
external/libcdr/ubsan.patch
vendored
@@ -1,64 +0,0 @@
|
||||
--- src/lib/CDRPath.cpp
|
||||
+++ src/lib/CDRPath.cpp
|
||||
@@ -796,7 +796,7 @@ void CDRPath::writeOut(librevenge::RVNGString &path, librevenge::RVNGString &vie
|
||||
|
||||
|
||||
width = qy - py;
|
||||
- viewBox.sprintf("%i %i %i %i", 0, 0, (unsigned)(2540*(qx - px)), (unsigned)(2540*(qy - py)));
|
||||
+ viewBox.sprintf("%i %i %i %i", 0, 0, (int)(2540*(qx - px)), (int)(2540*(qy - py)));
|
||||
|
||||
for (unsigned i = 0; i < vec.count(); ++i)
|
||||
{
|
||||
@@ -804,38 +804,38 @@ void CDRPath::writeOut(librevenge::RVNGString &path, librevenge::RVNGString &vie
|
||||
if (vec[i]["librevenge:path-action"]->getStr() == "M")
|
||||
{
|
||||
// 2540 is 2.54*1000, 2.54 in = 1 inch
|
||||
- sElement.sprintf("M%i %i", (unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
+ sElement.sprintf("M%i %i", (int)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
path.append(sElement);
|
||||
}
|
||||
else if (vec[i]["librevenge:path-action"]->getStr() == "L")
|
||||
{
|
||||
- sElement.sprintf("L%i %i", (unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
+ sElement.sprintf("L%i %i", (int)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
path.append(sElement);
|
||||
}
|
||||
else if (vec[i]["librevenge:path-action"]->getStr() == "C")
|
||||
{
|
||||
- sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((vec[i]["svg:x1"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y1"]->getDouble()-py)*2540), (unsigned)((vec[i]["svg:x2"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y2"]->getDouble()-py)*2540), (unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
+ sElement.sprintf("C%i %i %i %i %i %i", (int)((vec[i]["svg:x1"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y1"]->getDouble()-py)*2540), (int)((vec[i]["svg:x2"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y2"]->getDouble()-py)*2540), (int)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
path.append(sElement);
|
||||
}
|
||||
else if (vec[i]["librevenge:path-action"]->getStr() == "Q")
|
||||
{
|
||||
- sElement.sprintf("Q%i %i %i %i", (unsigned)((vec[i]["svg:x1"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y1"]->getDouble()-py)*2540), (unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
- (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
+ sElement.sprintf("Q%i %i %i %i", (int)((vec[i]["svg:x1"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y1"]->getDouble()-py)*2540), (int)((vec[i]["svg:x"]->getDouble()-px)*2540),
|
||||
+ (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
path.append(sElement);
|
||||
}
|
||||
else if (vec[i]["librevenge:path-action"]->getStr() == "A")
|
||||
{
|
||||
- sElement.sprintf("A%i %i %i %i %i %i %i", (unsigned)((vec[i]["svg:rx"]->getDouble())*2540),
|
||||
- (unsigned)((vec[i]["svg:ry"]->getDouble())*2540), (vec[i]["librevenge:rotate"] ? vec[i]["librevenge:rotate"]->getInt() : 0),
|
||||
+ sElement.sprintf("A%i %i %i %i %i %i %i", (int)((vec[i]["svg:rx"]->getDouble())*2540),
|
||||
+ (int)((vec[i]["svg:ry"]->getDouble())*2540), (vec[i]["librevenge:rotate"] ? vec[i]["librevenge:rotate"]->getInt() : 0),
|
||||
(vec[i]["librevenge:large-arc"] ? vec[i]["librevenge:large-arc"]->getInt() : 1),
|
||||
(vec[i]["librevenge:sweep"] ? vec[i]["librevenge:sweep"]->getInt() : 1),
|
||||
- (unsigned)((vec[i]["svg:x"]->getDouble()-px)*2540), (unsigned)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
+ (int)((vec[i]["svg:x"]->getDouble()-px)*2540), (int)((vec[i]["svg:y"]->getDouble()-py)*2540));
|
||||
path.append(sElement);
|
||||
}
|
||||
else if (vec[i]["librevenge:path-action"]->getStr() == "Z")
|
||||
@@ -213,10 +213,10 @@
|
||||
"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
|
||||
},
|
||||
{
|
||||
"url": "https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz",
|
||||
"sha256": "6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48",
|
||||
"url": "https://dev-www.libreoffice.org/src/libcdr-0.1.6.tar.xz",
|
||||
"sha256": "01cd00b04a030977e544433c2d127c997205332cd9b8e35ec0ee17110da7f861",
|
||||
"type": "file",
|
||||
"dest-filename": "external/tarballs/libcdr-0.1.5.tar.xz"
|
||||
"dest-filename": "external/tarballs/libcdr-0.1.6.tar.xz"
|
||||
},
|
||||
{
|
||||
"url": "https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz",
|
||||
|
||||
Reference in New Issue
Block a user