strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload libmwaw 0.3.19

Browse source 
Change-Id: Ibb26390e6cc13c925f499bf95cfc6177d8c9b735
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115355
Tested-by: Jenkins
Reviewed-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
David Tardon 2021-05-10 19:16:20 +02:00
parent 9c9f3ae5d8
commit 158737c2aa
6 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -9235,7 +9235,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.18])
libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.19])
libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.8])

4
download.lst
View file

@ -184,8 +184,8 @@ export MDNSRESPONDER_SHA256SUM := e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e39
export MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
export MSPUB_SHA256SUM := ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
export MSPUB_TARBALL := libmspub-0.1.4.tar.xz
export MWAW_SHA256SUM := fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f
export MWAW_VERSION_MICRO := 18
export MWAW_SHA256SUM := b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af
export MWAW_VERSION_MICRO := 19
export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
export MYTHES_SHA256SUM := 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz

25
external/libmwaw/0001-drop-unneeded-include.patch.1 vendored
View file

@ -1,25 +0,0 @@
From db0450c5bacdf0f3970a8838ff989b7e5390ffff Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 8 Apr 2021 23:07:13 +0200
Subject: [PATCH] drop unneeded include
---
src/lib/Canvas5StyleManager.cxx | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/Canvas5StyleManager.cxx b/src/lib/Canvas5StyleManager.cxx
index 7cb368f0..f6b3338a 100644
--- a/src/lib/Canvas5StyleManager.cxx
+++ b/src/lib/Canvas5StyleManager.cxx
@@ -31,8 +31,6 @@
* instead of those above.
*/
-#include <strings.h>
-
#include <cmath>
#include <iomanip>
#include <iostream>
--
2.30.2

2
external/libmwaw/Library_mwaw.mk vendored
View file

@ -41,7 +41,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
UnpackedTarball/libmwaw/src/lib/BeagleWksText \
UnpackedTarball/libmwaw/src/lib/Canvas5BMParser \
UnpackedTarball/libmwaw/src/lib/Canvas5Graph \
UnpackedTarball/libmwaw/src/lib/Canvas5Image \
UnpackedTarball/libmwaw/src/lib/Canvas5Parser \
UnpackedTarball/libmwaw/src/lib/Canvas5Structure \
UnpackedTarball/libmwaw/src/lib/Canvas5StyleManager \

4
external/libmwaw/UnpackedTarball_libmwaw.mk vendored
View file

@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0))
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmwaw))
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
external/libmwaw/0001-drop-unneeded-include.patch.1 \
))
ifneq ($(OS),MACOSX)
ifneq ($(OS),WNT)
$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \

6
solenv/flatpak-manifest.in
View file

@ -273,10 +273,10 @@
"dest-filename": "external/tarballs/libmspub-0.1.4.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.18.tar.xz",
"sha256": "fc5d051680f8000be64ffebc0b0c58716b1c9bf06003ec399387b109d1ed1e0f",
"url": "https://dev-www.libreoffice.org/src/libmwaw-0.3.19.tar.xz",
"sha256": "b272e234eefc828c4bb8344af0f047a62e070f530e9e2fba11b04c8db8eda5af",
"type": "file",
"dest-filename": "external/tarballs/libmwaw-0.3.18.tar.xz"
"dest-filename": "external/tarballs/libmwaw-0.3.19.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libodfgen-0.1.8.tar.xz",