Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2830fd1e4e | ||
|
|
f7138835d2 | ||
|
|
b2521bbc83 | ||
|
|
52457cf6da | ||
|
|
6c7720102a | ||
|
|
c55ec329f0 | ||
|
|
6be8fa1894 | ||
|
|
1db514cfac | ||
|
|
287c807ee4 | ||
|
|
03a470f266 |
15
README
15
README
@@ -1,15 +0,0 @@
|
||||
This layer depends on:
|
||||
|
||||
URI: git://git.openembedded.org/openembedded-core
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
URI: git://git.openembedded.org/meta-openembedded
|
||||
branch: master
|
||||
revision: HEAD
|
||||
|
||||
Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-office]' in the subject'
|
||||
|
||||
When sending single patches, please using something like 'git send-email -1 --to openembedded-devel@lists.openembedded.org --subject-prefix=meta-office][PATCH'
|
||||
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
|
||||
27
README.md
Normal file
27
README.md
Normal file
@@ -0,0 +1,27 @@
|
||||
OE layer for office applications as libreoffice
|
||||
-----------------------------------------------
|
||||
|
||||
|
||||
Layer dependencies:
|
||||
----------------------
|
||||
see [layer.conf](conf/layer.conf) for dependencies and https://layers.openembedded.org/layerindex/branch/master/layers/ where to find layers
|
||||
|
||||
|
||||
Contributing
|
||||
------------
|
||||
* Submit any patches against the `meta-office` layer by using the GitHub pull-request feature.
|
||||
|
||||
|
||||
Policies
|
||||
--------
|
||||
* Please do not send private emails to maintainers. For questions/suggestions.. use GitHub issues.
|
||||
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
|
||||
* Use 4 spaces for indention always
|
||||
* 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.
|
||||
|
||||
|
||||
Maintainers
|
||||
-----------
|
||||
|
||||
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>
|
||||
@@ -12,4 +12,6 @@ SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
|
||||
DEPENDS = "glew glm boost"
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From ae6d997f605c5913ba8a10a8ae71a947f7e10f0c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Fri, 15 Mar 2019 22:29:26 +0100
|
||||
Subject: [PATCH] Fix build with boost >= 1.69.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Backport [1]
|
||||
|
||||
[1] https://github.com/LibreOffice/core/commit/23a8d5ffbbe58761b89f590f0735abccd69a3681
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
sfx2/source/appl/shutdownicon.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
|
||||
index a8b8a13..4db03c4 100644
|
||||
--- a/sfx2/source/appl/shutdownicon.cxx
|
||||
+++ b/sfx2/source/appl/shutdownicon.cxx
|
||||
@@ -177,7 +177,7 @@ bool LoadModule()
|
||||
#endif // ENABLE_QUICKSTART_APPLET
|
||||
}
|
||||
assert(!boost::logic::indeterminate(loaded));
|
||||
- return loaded;
|
||||
+ return bool(loaded);
|
||||
}
|
||||
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -155,6 +155,8 @@ EXTRA_OECONF += " \
|
||||
--with-system-lpsolve \
|
||||
"
|
||||
|
||||
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
|
||||
|
||||
PACKAGECONFIG ??= " \
|
||||
gtk \
|
||||
mariadb \
|
||||
@@ -241,15 +243,15 @@ LO_LANGUAGE_FILES = " \
|
||||
python lo_do_split_locales() {
|
||||
import glob, subprocess
|
||||
|
||||
packages = (d.getVar('PACKAGES', True) or "").split()
|
||||
packages = (d.getVar('PACKAGES') or "").split()
|
||||
|
||||
datadir = d.getVar('datadir', True)
|
||||
datadir = d.getVar('datadir')
|
||||
if not datadir:
|
||||
bb.note("datadir not defined")
|
||||
return
|
||||
|
||||
dvar = d.getVar('PKGD', True)
|
||||
pn = d.getVar('LOCALEBASEPN', True)
|
||||
dvar = d.getVar('PKGD')
|
||||
pn = d.getVar('LOCALEBASEPN')
|
||||
|
||||
if pn + '-locale' in packages:
|
||||
packages.remove(pn + '-locale')
|
||||
@@ -257,9 +259,9 @@ python lo_do_split_locales() {
|
||||
# extract locales from translation source path
|
||||
# this won't add en-US which comes with base sources
|
||||
locales = []
|
||||
transpaths = glob.glob('%s/translations/source/*' % d.getVar('S', True))
|
||||
transpaths = glob.glob('%s/translations/source/*' % d.getVar('S'))
|
||||
for l in transpaths:
|
||||
locale = l.replace('%s/translations/source/' % d.getVar('S', True), '')
|
||||
locale = l.replace('%s/translations/source/' % d.getVar('S'), '')
|
||||
if not locale in locales:
|
||||
locales.append(locale)
|
||||
|
||||
@@ -273,7 +275,7 @@ python lo_do_split_locales() {
|
||||
|
||||
# check for files matching at each location / language
|
||||
langfiles = dict()
|
||||
for transvar in d.getVar('LO_LANGUAGE_FILES', True).split():
|
||||
for transvar in d.getVar('LO_LANGUAGE_FILES').split():
|
||||
filesfound = 0
|
||||
for locale in sorted(locales):
|
||||
pattern = transvar.replace('%{1}', locale)
|
||||
@@ -291,13 +293,13 @@ python lo_do_split_locales() {
|
||||
if translocation in fallbacksearchresult:
|
||||
fallbacksearchresult.replace(translocation, '')
|
||||
else:
|
||||
bb.warn('%s language file pattern not found: %s' % (d.getVar('PN', True), transvar))
|
||||
bb.warn('%s language file pattern not found: %s' % (d.getVar('PN'), transvar))
|
||||
|
||||
# setup packages for locales with files found
|
||||
summary = d.getVar('SUMMARY', True) or pn
|
||||
description = d.getVar('DESCRIPTION', True) or ""
|
||||
locale_section = d.getVar('LOCALE_SECTION', True)
|
||||
mlprefix = d.getVar('MLPREFIX', True) or ""
|
||||
summary = d.getVar('SUMMARY') or pn
|
||||
description = d.getVar('DESCRIPTION') or ""
|
||||
locale_section = d.getVar('LOCALE_SECTION')
|
||||
mlprefix = d.getVar('MLPREFIX') or ""
|
||||
for locale in locales:
|
||||
if locale in langfiles:
|
||||
ln = legitimize_package_name(locale)
|
||||
|
||||
@@ -18,6 +18,7 @@ SRC_URI += " \
|
||||
file://0006-Fix-build-with-recent-icu.patch \
|
||||
file://0007-fix-build-with-poppler-0.64.patch \
|
||||
file://0008-Make-virtual-ScValidationDlg-non-inline.patch \
|
||||
file://0009-Fix-build-with-boost-1.69.0.patch \
|
||||
"
|
||||
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
|
||||
|
||||
@@ -36,7 +37,7 @@ EXTRA_OECONF = " \
|
||||
--without-doxygen \
|
||||
--enable-release-build \
|
||||
--disable-verbose \
|
||||
--with-parallelism=${@oe.utils.cpu_count()} \
|
||||
${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
|
||||
\
|
||||
--with-system-librevenge \
|
||||
--with-system-libabw \
|
||||
|
||||
@@ -21,8 +21,9 @@ inherit cmake
|
||||
|
||||
DEPENDS = "boost zlib"
|
||||
|
||||
EXTRA_OECMAKE = "-DENABLE_COMPILE_TESTS=OFF -DBUILD_CONTRIBS_LIB=ON"
|
||||
|
||||
FILES_${PN}-dev += "${libdir}/cmake"
|
||||
EXTRA_OECMAKE = " \
|
||||
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
|
||||
-DENABLE_COMPILE_TESTS=OFF \
|
||||
-DBUILD_CONTRIBS_LIB=ON"
|
||||
|
||||
BBCLASSEXTEND = "native"
|
||||
|
||||
@@ -10,3 +10,7 @@ DEPENDS += "freetype"
|
||||
SRC_URI = "${SOURCEFORGE_MIRROR}/project/silgraphite/${BPN}/${BPN}-${PV}.tgz"
|
||||
SRC_URI[md5sum] = "5b8d22a8bbf031838e31432868c0109c"
|
||||
SRC_URI[sha256sum] = "f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd"
|
||||
|
||||
EXTRA_OECMAKE += " \
|
||||
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
|
||||
"
|
||||
|
||||
@@ -13,7 +13,10 @@ inherit cmake
|
||||
|
||||
DEPENDS = "tiff jpeg libpng"
|
||||
|
||||
EXTRA_OECMAKE += "-DWITH_VIGRANUMPY=0"
|
||||
EXTRA_OECMAKE += " \
|
||||
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
|
||||
-DWITH_VIGRANUMPY=0 \
|
||||
"
|
||||
|
||||
do_install_append() {
|
||||
# doc does not have useful content and is installed at the wrong location
|
||||
|
||||
Reference in New Issue
Block a user