Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da717fcb76 | ||
|
|
b5a86b19c0 | ||
|
|
43fe575d65 | ||
|
|
a71dc8a39e | ||
|
|
f36398c316 | ||
|
|
dc0e114f40 | ||
|
|
1b8b8af820 | ||
|
|
2fc0073857 | ||
|
|
7b99c5010c |
@@ -17,8 +17,8 @@ Policies
|
||||
* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-office/issues).
|
||||
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
|
||||
* Use 4 spaces for indentation always (shell and python code)
|
||||
* For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
|
||||
* Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
|
||||
* For splitting of long list values use four-space indentation on successive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
|
||||
* Pull-requests with patches fixing issues for musl, clang or gold-linker are accepted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
|
||||
* Be aware that **this layer changes other layer's defaults by bbappends**. Maintainer disagrees with common 'configure to death practice' and won't waste time explaining dozens of knobs that are mandatory to get working/useful builds. See
|
||||
[appends](appends).
|
||||
Pull requests removing appends for sake of magic 'compliant' scripts are not accepted.
|
||||
|
||||
@@ -64,6 +64,7 @@ EXTRA_OECONF = " \
|
||||
--with-libwmf-config=${STAGING_DIR} \
|
||||
"
|
||||
|
||||
CXXFLAGS += "-std=c++11"
|
||||
LDFLAGS += "-lgmodule-2.0"
|
||||
|
||||
do_compile() {
|
||||
|
||||
@@ -12,6 +12,6 @@ SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
CXXFLAGS += "-std=c++11 -DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
|
||||
DEPENDS = "glew glm boost"
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
From 723fb0cb6c7594a26a858fc295369122507f0174 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 7 May 2021 23:09:56 +0200
|
||||
Subject: [PATCH] Add #include <cstddef> to fix build with gcc11
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Stolen from [1]
|
||||
|
||||
[1] https://src.fedoraproject.org/rpms/libwpd/blob/rawhide/f/libwpd-gcc11.patch
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
src/lib/WPXContentListener.cpp | 1 +
|
||||
src/lib/WPXTable.cpp | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/lib/WPXContentListener.cpp b/src/lib/WPXContentListener.cpp
|
||||
index ab0f9b1..0b559e6 100644
|
||||
--- a/src/lib/WPXContentListener.cpp
|
||||
+++ b/src/lib/WPXContentListener.cpp
|
||||
@@ -23,6 +23,7 @@
|
||||
* Corel Corporation or Corel Corporation Limited."
|
||||
*/
|
||||
|
||||
+#include <cstddef>
|
||||
#include "WPXContentListener.h"
|
||||
#include "WPXPageSpan.h"
|
||||
#include "libwpd_internal.h"
|
||||
diff --git a/src/lib/WPXTable.cpp b/src/lib/WPXTable.cpp
|
||||
index 0ad202a..1e68d1d 100644
|
||||
--- a/src/lib/WPXTable.cpp
|
||||
+++ b/src/lib/WPXTable.cpp
|
||||
@@ -25,6 +25,7 @@
|
||||
* Corel Corporation or Corel Corporation Limited."
|
||||
*/
|
||||
|
||||
+#include <cstddef>
|
||||
#include "WPXTable.h"
|
||||
|
||||
#include "libwpd_internal.h"
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -5,7 +5,10 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
|
||||
"
|
||||
|
||||
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
|
||||
SRC_URI = " \
|
||||
http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \
|
||||
file://0001-Add-include-cstddef-to-fix-build-with-gcc11.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "d5e44712c4674d499afb8e89d830fcad"
|
||||
SRC_URI[sha256sum] = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
PV = "7.1.2.2"
|
||||
DIRV = "7.1.2"
|
||||
PV = "7.1.5.2"
|
||||
DIRV = "7.1.5"
|
||||
|
||||
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
|
||||
SRC_URI[sha256sum] = "6ba58991f626dc42c75ca2c28f91915ffabae18ba5a5fba5344ed7004eba29f8"
|
||||
SRC_URI[sha256sum] = "aeaf30367665bdfdcf780d2b28e304352255de778db41d32d12cd77d5b2385ce"
|
||||
|
||||
@@ -18,7 +18,7 @@ SRC_URI += " \
|
||||
file://0010-Support-install-to-find-bash-completion.in.patch \
|
||||
"
|
||||
|
||||
SRC_URI[translations.sha256sum] = "a724be1fb8895ad14d1e1e6558d1bb65037d1f15858bd48228ad0cb66828a2c8"
|
||||
SRC_URI[translations.sha256sum] = "b86740debc717bdeca918ba068ead6c7a16e70a232eeac43bbb31e2a02d0c559"
|
||||
|
||||
DEPENDS += " \
|
||||
${BPN}-native \
|
||||
|
||||
Reference in New Issue
Block a user