ports/contrib (3.7): libmspub: pulled patches from libreoffice
commit 3ef2e2b4c8fa4f0a8aaecf4e2f97aa730ffe730f Author: Tim Biermann <tbier@posteo.de> Date: Sat Jan 28 15:46:50 2023 +0100 libmspub: pulled patches from libreoffice diff --git a/libmspub/.signature b/libmspub/.signature index c41ef8c7c..fcb0783a1 100644 --- a/libmspub/.signature +++ b/libmspub/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zRerLxiD3FFLD2jtuE5NALN6BvQJTHWqOOzi/PuyPgNszyl2uSGfOwdlKXQd5S2LdF9gvr0wc6p3EzGKPYZZww= -SHA256 (Pkgfile) = c2ffd1ac75b63ea6068f23129493d34991d621b6e41bf74f623040838a62855b +RWSagIOpLGJF3/4B+uIF3XLxFQ35h9jefbk0HLRUrFPVP5mpUPR5X2kRTVkGIHlLWkS4B0a+6ngPaiHZyR8LA+A3oQvUnzUQqwA= +SHA256 (Pkgfile) = 763159ee28fc746e80e2e63a70517d9769341ba4a3d8bb65fe2ad709ad892a2f SHA256 (.footprint) = c8c4c6a874318cd6b040da6b4a816e690a7aa8b0c2631a40a5643face3b2cbb7 SHA256 (libmspub-0.1.4.tar.xz) = ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba SHA256 (missing_include.patch) = 7fcc8f5a2cdfc91b7c8d4fdc2e30c7be5dacc7c450eab2b083d1539970d04e6e +SHA256 (ubsan.patch) = 3cebc78bd752ad6c5e36e25d8db4e05c95317eacc2fb4e30bee0491ef52d45db diff --git a/libmspub/Pkgfile b/libmspub/Pkgfile index 896baf8a3..125abbb9b 100644 --- a/libmspub/Pkgfile +++ b/libmspub/Pkgfile @@ -5,13 +5,17 @@ name=libmspub version=0.1.4 -release=1 +release=2 source=(https://dev-www.libreoffice.org/src/libmspub/$name-$version.tar.xz - missing_include.patch) + missing_include.patch + ubsan.patch) build() { cd $name-$version + patch -Np1 -i $SRC/missing_include.patch + patch -Np0 -i $SRC/ubsan.patch + ./configure --prefix=/usr make make DESTDIR=$PKG install diff --git a/libmspub/ubsan.patch b/libmspub/ubsan.patch new file mode 100644 index 000000000..b58249e18 --- /dev/null +++ b/libmspub/ubsan.patch @@ -0,0 +1,12 @@ +--- src/lib/MSPUBContentChunkType.h ++++ src/lib/MSPUBContentChunkType.h +@@ -27,7 +27,8 @@ + CELLS = 0x63, + FONT = 0x6C, + IMAGE_2K, //these don't exist in Pub 2k3 so their value in the enum is not used. +- IMAGE_2K_DATA ++ IMAGE_2K_DATA, ++ MSPUBContentChunkType_dummy=0xFF // MSPUBParser.cpp:2359:9: runtime error: load of value 138, which is not a valid value for type 'libmspub::MSPUBContentChunkType' + }; + } // namespace libmspub +
participants (1)
-
crux@crux.nu