[Libreoffice-commits] core.git: download.lst external/libodfgen
David Tardon
dtardon at redhat.com
Mon Nov 24 02:42:32 PST 2014
download.lst | 4 -
external/libodfgen/ExternalPackage_libodfgen.mk | 2
external/libodfgen/UnpackedTarball_libodfgen.mk | 4 -
external/libodfgen/ubsan.patch | 60 ------------------------
4 files changed, 3 insertions(+), 67 deletions(-)
New commits:
commit 4578ed5b0ae63850704027861b3d475d818ead33
Author: David Tardon <dtardon at redhat.com>
Date: Mon Nov 24 11:41:04 2014 +0100
upload libodfgen 0.1.2
Change-Id: I9a4719e60f910256c529551fdbb387e98aefd6ce
diff --git a/download.lst b/download.lst
index aa700aa..09d8a5f 100644
--- a/download.lst
+++ b/download.lst
@@ -108,8 +108,8 @@ export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := b279551b7638d0e36d1199548124c247-nss-3.16.5-with-nspr-4.10.6.tar.gz
-export ODFGEN_MD5SUM := c22c83c17cda0754382ada4e116594b7
-export ODFGEN_TARBALL := libodfgen-0.1.1.tar.bz2
+export ODFGEN_MD5SUM := b261066a880ba4ad2d79c9291c8037af
+export ODFGEN_TARBALL := libodfgen-0.1.2.tar.bz2
export OPENCOLLADA_MD5SUM := 4ca8a6ef0afeefc864e9ef21b9f14bd6
export OPENCOLLADA_TARBALL := OpenCOLLADA-master-6509aa13af.tar.bz2
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
diff --git a/external/libodfgen/ExternalPackage_libodfgen.mk b/external/libodfgen/ExternalPackage_libodfgen.mk
index 74423b4..0c05876 100644
--- a/external/libodfgen/ExternalPackage_libodfgen.mk
+++ b/external/libodfgen/ExternalPackage_libodfgen.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen
else ifeq ($(OS),WNT)
$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.dll,src/.libs/libodfgen-0.1.dll))
else ifeq ($(filter IOS ANDROID,$(OS)),)
-$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.1))
+$(eval $(call gb_ExternalPackage_add_file,libodfgen,$(LIBO_LIB_FOLDER)/libodfgen-0.1.so.1,src/.libs/libodfgen-0.1.so.1.0.2))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk
index 66707dd..bb2153f 100644
--- a/external/libodfgen/UnpackedTarball_libodfgen.mk
+++ b/external/libodfgen/UnpackedTarball_libodfgen.mk
@@ -13,8 +13,4 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0))
-$(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \
- external/libodfgen/ubsan.patch \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/external/libodfgen/ubsan.patch b/external/libodfgen/ubsan.patch
deleted file mode 100644
index 0b807dd..0000000
--- a/external/libodfgen/ubsan.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-See <https://sourceforge.net/p/libwpd/tickets/2/attachment/0001-Avoid-undefined-behavior-casts-from-potentially-nega.patch>:
---- src/GraphicFunctions.cxx
-+++ src/GraphicFunctions.cxx
-@@ -448,42 +448,42 @@
- // 2540 is 2.54*1000, 2.54 in = 1 inch
- if (path[i]["svg:x"] && action[0] == 'H')
- {
-- sElement.sprintf("H%i", (unsigned)((getInchValue(path[i]["svg:x"])-px)*2540));
-+ sElement.sprintf("H%i", (int)((getInchValue(path[i]["svg:x"])-px)*2540));
- sValue.append(sElement);
- }
- else if (path[i]["svg:y"] && action[0] == 'V')
- {
-- sElement.sprintf("V%i", (unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+ sElement.sprintf("V%i", (int)((getInchValue(path[i]["svg:y"])-py)*2540));
- sValue.append(sElement);
- }
- else if (coordOk && (action[0] == 'M' || action[0] == 'L' || action[0] == 'T'))
- {
-- sElement.sprintf("%c%i %i", action[0], (unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+ sElement.sprintf("%c%i %i", action[0], (int)((getInchValue(path[i]["svg:x"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y"])-py)*2540));
- sValue.append(sElement);
- }
- else if (coord1Ok && (action[0] == 'Q' || action[0] == 'S'))
- {
-- sElement.sprintf("%c%i %i %i %i", action[0], (unsigned)((getInchValue(path[i]["svg:x1"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y1"])-py)*2540), (unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+ sElement.sprintf("%c%i %i %i %i", action[0], (int)((getInchValue(path[i]["svg:x1"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y1"])-py)*2540), (int)((getInchValue(path[i]["svg:x"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y"])-py)*2540));
- sValue.append(sElement);
- }
- else if (coord2Ok && action[0] == 'C')
- {
-- sElement.sprintf("C%i %i %i %i %i %i", (unsigned)((getInchValue(path[i]["svg:x1"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y1"])-py)*2540), (unsigned)((getInchValue(path[i]["svg:x2"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y2"])-py)*2540), (unsigned)((getInchValue(path[i]["svg:x"])-px)*2540),
-- (unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+ sElement.sprintf("C%i %i %i %i %i %i", (int)((getInchValue(path[i]["svg:x1"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y1"])-py)*2540), (int)((getInchValue(path[i]["svg:x2"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y2"])-py)*2540), (int)((getInchValue(path[i]["svg:x"])-px)*2540),
-+ (int)((getInchValue(path[i]["svg:y"])-py)*2540));
- sValue.append(sElement);
- }
- else if (coordOk && path[i]["svg:rx"] && path[i]["svg:ry"] && action[0] == 'A')
- {
-- sElement.sprintf("A%i %i %i %i %i %i %i", (unsigned)((getInchValue(path[i]["svg:rx"]))*2540),
-- (unsigned)((getInchValue(path[i]["svg:ry"]))*2540), (path[i]["librevenge:rotate"] ? path[i]["librevenge:rotate"]->getInt() : 0),
-+ sElement.sprintf("A%i %i %i %i %i %i %i", (int)((getInchValue(path[i]["svg:rx"]))*2540),
-+ (int)((getInchValue(path[i]["svg:ry"]))*2540), (path[i]["librevenge:rotate"] ? path[i]["librevenge:rotate"]->getInt() : 0),
- (path[i]["librevenge:large-arc"] ? path[i]["librevenge:large-arc"]->getInt() : 1),
- (path[i]["librevenge:sweep"] ? path[i]["librevenge:sweep"]->getInt() : 1),
-- (unsigned)((getInchValue(path[i]["svg:x"])-px)*2540), (unsigned)((getInchValue(path[i]["svg:y"])-py)*2540));
-+ (int)((getInchValue(path[i]["svg:x"])-px)*2540), (int)((getInchValue(path[i]["svg:y"])-py)*2540));
- sValue.append(sElement);
- }
- else if (action[0] == 'Z')
More information about the Libreoffice-commits
mailing list