diff options
author | Tim Biermann <tbier@posteo.de> | 2019-12-20 21:12:48 +0100 |
---|---|---|
committer | Tim Biermann <tbier@posteo.de> | 2019-12-20 21:12:48 +0100 |
commit | c5356df564754b0f2d046d1dbfe5bcb9c79d1486 (patch) | |
tree | 77203f94643446cd77bb259d262d2df8c9089fd2 /libfreehand | |
parent | 00b2d12c8b6a42eeface887f6ebf7764076730d8 (diff) | |
download | contrib-c5356df564754b0f2d046d1dbfe5bcb9c79d1486.tar.gz contrib-c5356df564754b0f2d046d1dbfe5bcb9c79d1486.tar.xz |
libfreehand: fix build against icu 65.1
Diffstat (limited to 'libfreehand')
-rw-r--r-- | libfreehand/.signature | 5 | ||||
-rw-r--r-- | libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch | 29 | ||||
-rw-r--r-- | libfreehand/Pkgfile | 6 |
3 files changed, 36 insertions, 4 deletions
diff --git a/libfreehand/.signature b/libfreehand/.signature index 327051b05..4da451ad0 100644 --- a/libfreehand/.signature +++ b/libfreehand/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36ornjPk91b/2p6qugAg9HeS3SBpLh0iZbhKjpPgKWMKlx7KrlrPa359hxZAc4Y8RsuoFK6S/LrhAL0l4t//9QE= -SHA256 (Pkgfile) = e936213f9ee3cf312ccad9d47cc22e07565feba455f37382b1d9dddb9dc8c41c +RWSagIOpLGJF3869QtYiEkTdnXoce7it9rXfPPuiLgb+j+32c6nR8Qge9A4X6kEKKK1P9UcK++yHdTOVYIDwwqurKEoXuMJ42AY= +SHA256 (Pkgfile) = f462da6a6df8fa5f093d377c549671290a57ef2faa540b5ca303c7f8a40a2e26 SHA256 (.footprint) = 04270a51462a7b703152f5066f7f1b2a1054d8916d8de74dfc6df8535a8ee999 SHA256 (libfreehand-0.1.2.tar.xz) = 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac +SHA256 (0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch) = 11b5b5fcbb4f427486e83ee042cd3f2b030bcf8238f5d1925942416067d0254b diff --git a/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch b/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch new file mode 100644 index 000000000..2a904e4fb --- /dev/null +++ b/libfreehand/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch @@ -0,0 +1,29 @@ +From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Fri, 4 Oct 2019 01:46:12 +0200 +Subject: [PATCH] Add missing semicolon to fix build with icu 65.1 + +Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088 +Reviewed-on: https://gerrit.libreoffice.org/80224 +Reviewed-by: Miklos Vajna <vmiklos@collabora.com> +Tested-by: Miklos Vajna <vmiklos@collabora.com> +--- + src/lib/libfreehand_utils.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp +index 439c457..32f23e0 100644 +--- a/src/lib/libfreehand_utils.cpp ++++ b/src/lib/libfreehand_utils.cpp +@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne + while (j < length) + { + UChar32 c; +- U16_NEXT(s, j, length, c) ++ U16_NEXT(s, j, length, c); + unsigned char outbuf[U8_MAX_LENGTH+1]; + int i = 0; + U8_APPEND_UNSAFE(&outbuf[0], i, c); +-- +2.23.0 + diff --git a/libfreehand/Pkgfile b/libfreehand/Pkgfile index 6bf7a686c..d038e3325 100644 --- a/libfreehand/Pkgfile +++ b/libfreehand/Pkgfile @@ -5,11 +5,13 @@ name=libfreehand version=0.1.2 -release=2 -source=(https://dev-www.libreoffice.org/src/libfreehand/$name-$version.tar.xz) +release=3 +source=(https://dev-www.libreoffice.org/src/libfreehand/$name-$version.tar.xz + 0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch) build() { cd $name-$version + patch -Np1 -i $SRC/0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch ./configure --prefix=/usr \ --disable-werror \ --without-docs |