From e9fc16ac9b75b909d416139d308f34ad475a0fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Mon, 2 Jul 2018 19:59:22 +0200 Subject: [PATCH] libfreehand: Fix build with gcc 8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...parentheses-in-declaration-of-paddin.patch | 32 +++++++++++++++++++ .../libfreehand/libfreehand_0.1.2.bb | 5 ++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch diff --git a/recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch b/recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch new file mode 100644 index 0000000..f15db6a --- /dev/null +++ b/recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch @@ -0,0 +1,32 @@ +From af65e7374d6d5058e46b9173efdedfc661f451b7 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Thu, 1 Feb 2018 13:05:51 +0100 +Subject: [PATCH] =?UTF-8?q?WaE:=20unnecessary=20parentheses=20in=20declara?= + =?UTF-8?q?tion=20of=20=E2=80=98padding=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Change-Id: I6de141c5ec2520538f8232bd524d29e25710bef5 +--- + src/lib/FHCollector.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/FHCollector.cpp b/src/lib/FHCollector.cpp +index f39c8df..3f24118 100644 +--- a/src/lib/FHCollector.cpp ++++ b/src/lib/FHCollector.cpp +@@ -1907,7 +1907,7 @@ void libfreehand::FHCollector::_outputDisplayText(const libfreehand::FHDisplayTe + textObjectProps.insert("svg:width", width); + for (int i=0; i<4; ++i) // osnola: let assume that there is no padding + { +- char const *(padding[])= {"fo:padding-left","fo:padding-right","fo:padding-top","fo:padding-bottom"}; ++ char const *padding[] = {"fo:padding-left","fo:padding-right","fo:padding-top","fo:padding-bottom"}; + textObjectProps.insert(padding[i],0,librevenge::RVNG_POINT); + } + if (!FH_ALMOST_ZERO(rotation)) +-- +2.14.4 + diff --git a/recipes-filter/libfreehand/libfreehand_0.1.2.bb b/recipes-filter/libfreehand/libfreehand_0.1.2.bb index f1afdf8..c63deb0 100644 --- a/recipes-filter/libfreehand/libfreehand_0.1.2.bb +++ b/recipes-filter/libfreehand/libfreehand_0.1.2.bb @@ -4,7 +4,10 @@ LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = " \ file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \ " -SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI = " \ + http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \ + file://0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch \ +" SRC_URI[md5sum] = "c3788f5686839fd097bd77d8f51c3d04" SRC_URI[sha256sum] = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"