zepto-forks/meta-office
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zepto-forks:master
Branches Tags
zepto-forks:master zepto-forks:hardknott zepto-forks:dunfell zepto-forks:zeus zepto-forks:warrior zepto-forks:thud zepto-forks:sumo zepto-forks:rocko zepto-forks:morty zepto-forks:jethro
..
compare: zepto-forks:rocko
Branches Tags
zepto-forks:master zepto-forks:hardknott zepto-forks:dunfell zepto-forks:zeus zepto-forks:warrior zepto-forks:thud zepto-forks:sumo zepto-forks:rocko zepto-forks:morty zepto-forks:jethro

1 Commits
master ... rocko

Author SHA1 Message Date
Andreas Müller
2043da8924 layer.conf: add LAYERSERIES_COMPAT 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 2018-04-06 23:42:18 +02:00
129 changed files with 3426 additions and 3397 deletions
Expand all files Collapse all files

15
README Normal file
View File

@@ -0,0 +1,15 @@
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@googlemail.com>

30
README.md
View File

@@ -1,30 +0,0 @@
OE layer for office applications as libreoffice
-----------------------------------------------
Layer dependencies:
----------------------
see [layer.conf](conf/layer.conf) for dependencies and [Layer-index](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 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 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.
Maintainers
-----------
Layer maintainer: Andreas Müller <schnitzeltony@gmail.com>

2
appends/harfbuzz/harfbuzz_%.bbappend
View File

@@ -1,2 +0,0 @@
PACKAGECONFIG:append:class-native = " graphite"
PACKAGECONFIG:append:class-target = " graphite"

75
classes/cmake_extra_sanity.bbclass
View File

@@ -1,75 +0,0 @@
inherit cmake_sysroot
# do_install:append:class-cross does not work so hack
do_install:prepend:class-native() {
no_staging_check=true
}
do_install:prepend:class-nativesdk() {
no_staging_check=true
}
do_install:append() {
# avoid strange prefixing seen often
old_dir=`pwd`
cd ${D}
if grep -qr 'usr\/\/usr' ; then
bbfatal 'usr//usr found - check sources for PREFIX or better CMAKE_INSTALL_PREFIX!'
fi
cd $old_dir
# check for staging links in non native recipes
# TBD: -> oe-core (1st part - genarated sources - should work with autotools too)
if [ x = x$no_staging_check ] ; then
error=
# check for generated sources
for f in `find ${B} -name '*.h' -o -name '*.cpp'` ; do
if grep -q 'recipe-sysroot' $f ; then
bbwarn "$f contains links to build sysroot!"
error=true
fi
done
# check installed cmake files
for f in `find ${D} -name '*.cmake'` ; do
if grep -q 'recipe-sysroot' "$f" ; then
bbwarn "$f contains links to build host sysroot!"
error=true
fi
done
if [ x != x$error ] ; then
bbfatal "One or more files contain links to build host sysroot ${STAGING_DIR_HOST}(-native)"
fi
fi
}
do_populate_sysroot[postfuncs] += "do_sysroot_cmake_sanity "
# check sysroot cmake files for links not relative and not to sysroots
do_sysroot_cmake_sanity() {
error=
for f in `cat ${CMAKEINSTALLED}` ; do
if grep -q ';${libdir}' "$f" ; then
bbwarn "$f contains links to ${libdir}!"
error=true
fi
if grep -q '\"${libdir}/lib' "$f" ; then
bbwarn "$f contains links to ${libdir}!"
error=true
fi
if grep -q ';${includedir}' "$f" ; then
bbwarn "$f contains links to ${includedir}!"
error=true
fi
if grep -q '\"${includedir}' "$f" ; then
bbwarn "$f contains links to ${includedir}!"
error=true
fi
done
if [ x != x$error ] ; then
bbfatal "One or more files in sysroot contain links to ${prefix}"
fi
}

16
conf/layer.conf
View File

@@ -1,22 +1,10 @@
# We have a conf and classes directory, append to BBPATH
BBPATH .= ":${LAYERDIR}"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/appends/*/*.bbappend"
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
BBFILE_COLLECTIONS += "office-layer"
BBFILE_PATTERN_office-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_office-layer = "7"
LAYERSERIES_COMPAT_office-layer = "rocko"
LAYERDEPENDS_office-layer = " \
core \
openembedded-layer \
meta-python \
gnome-layer \
networking-layer \
"
LAYERSERIES_COMPAT_office-layer = "honister kirkstone mickledore nanbield"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
libreoffice-dictionaries->hunspell \
"

39
recipes-abiword/abiword/abiword/0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch
View File

@@ -1,39 +0,0 @@
From c646159ce817506131b58fdab1cdc1cd6364df7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sun, 7 Feb 2016 21:45:20 +0100
Subject: [PATCH] plugins/aiksaurus/Makefile.am: remove uncomplete options
WITH_BUILTIN_AIKSAURUS_GTK
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* with gtk2 we won't use it
* it is missing in configure.ac causing
| plugins/aiksaurus/Makefile.am:5: error: WITH_BUILTIN_AIKSAURUS_GTK does not appear in AM_CONDITIONAL
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
plugins/aiksaurus/Makefile.am | 4 ----
1 file changed, 4 deletions(-)
diff --git a/plugins/aiksaurus/Makefile.am b/plugins/aiksaurus/Makefile.am
index d402c58..1034e2a 100644
--- a/plugins/aiksaurus/Makefile.am
+++ b/plugins/aiksaurus/Makefile.am
@@ -2,10 +2,6 @@ SUBDIRS =
if TOOLKIT_GTK
-if WITH_BUILTIN_AIKSAURUS_GTK
-SUBDIRS += aiksaurusgtk3
-platform_lib = aiksaurusgtk3/libAiksaurusGtk3.la
-endif
endif
--
2.5.0

143
recipes-abiword/abiword/abiword_3.0.5.bb
View File

@@ -1,143 +0,0 @@
SUMMARY = "AbiWord is free word processing program similar to Microsoft(r) Word"
HOMEPAGE = "http://www.abiword.org"
SECTION = "x11/office"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
DEPENDS = " \
perl-native \
gtk+ \
gtkmathview \
wv \
fribidi \
jpeg \
libpng \
librsvg \
libwmf-native \
asio \
evolution-data-server \
libxslt \
redland rasqal \
"
RDEPENDS:${PN}:append:libc-glibc = " \
glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \
"
RCONFLICTS:${PN} = "${PN}-embedded"
SRC_URI = " \
http://www.abisource.com/downloads/${BPN}/${PV}/source/${BP}.tar.gz \
file://0001-plugins-aiksaurus-Makefile.am-remove-uncomplete-opti.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
SRC_URI[sha256sum] = "1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4"
#want 3.x from 3.x.y for the installation directory
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
inherit features_check autotools-brokensep pkgconfig mime-xdg
REQUIRED_DISTRO_FEATURES = "x11"
PACKAGECONFIG ??= " \
collab-backend-xmpp \
libical \
"
PACKAGECONFIG[libical] = "--with-libical,--without-libical,libical raptor2"
PACKAGECONFIG[spell] = "--enable-spell,--disable-spell,enchant"
PACKAGECONFIG[collab-backend-xmpp] = "--enable-collab-backend-xmpp,--disable-collab-backend-xmpp,libgsf libxml2 loudmouth"
PACKAGECONFIG[collab-backend-tcp] = "--enable-collab-backend-tcp,--disable-collab-backend-tcp,libgsf libxml2"
PACKAGECONFIG[collab-backend-service] = "--enable-collab-backend-service,--disable-collab-backend-service,libgsf libxml2 libsoup-2.4 gnutls"
PACKAGECONFIG[collab-backend-telepathy] = "--enable-collab-backend-telepathy,--disable-collab-backend-telepathy,libgsf libxml2 telepathy-glib telepathy-mission-control"
PACKAGECONFIG[collab-backend-sugar] = "--enable-collab-backend-sugar,--disable-collab-backend-sugar,libgsf libxml2 dbus-glib"
EXTRA_OECONF = " \
--disable-static \
--enable-plugins \
--enable-clipart \
--enable-templates \
--without-gnomevfs \
--with-gtk2 \
--with-libwmf-config=${STAGING_DIR} \
"
CXXFLAGS += "-std=c++11"
LDFLAGS += "-lgmodule-2.0"
do_compile() {
cd goffice-bits2
make goffice-paths.h
make libgoffice.la
cd ${B}
oe_runmake
}
PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
FILES:${PN} += " \
${libdir}/lib${PN}-*.so \
${datadir}/mime-info \
${datadir}/icons/* \
${datadir}/appdata \
${datadir}/${PN}-${SHRT_VER}/glade \
${datadir}/${PN}-${SHRT_VER}/scripts \
${datadir}/${PN}-${SHRT_VER}/system.profile-en \
${datadir}/${PN}-${SHRT_VER}/system.profile-en_GB \
${datadir}/${PN}-${SHRT_VER}/templates/normal.awt \
${datadir}/${PN}-${SHRT_VER}/templates/normal.awt-en_GB \
${datadir}/${PN}-${SHRT_VER}/templates/Employee-Directory.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Business-Report.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Fax-Coversheet.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Resume.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Two-Columns.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Memo.awt \
${datadir}/${PN}-${SHRT_VER}/templates/Press-Release.awt \
${datadir}/${PN}-${SHRT_VER}/certs \
${datadir}/${PN}-${SHRT_VER}/ui \
${datadir}/${PN}-${SHRT_VER}/xsl* \
${datadir}/${PN}-${SHRT_VER}/mime-info \
${datadir}/${PN}-${SHRT_VER}/Pr*.xml \
"
# don't steal /usr/lib/libabiword-3.0.so from ${PN}
# in this case it's needed in ${PN}
FILES:${PN}-dev = " \
${includedir} \
${libdir}/pkgconfig \
${libdir}/${PN}*.la \
${libdir}/lib${PN}*.la \
${libdir}/${PN}-${SHRT_VER}/plugins/*.la \
"
FILES:${PN}-doc += "${datadir}/${PN}-*/readme*"
FILES:${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/strings"
FILES:${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/system.profile*"
FILES:${PN}-clipart += "${datadir}/${PN}-${SHRT_VER}/clipart"
FILES:${PN}-strings += "${datadir}/${PN}-${SHRT_VER}/AbiWord/strings"
FILES:${PN}-systemprofiles += "${datadir}/${PN}-${SHRT_VER}/AbiWord/system.profile*"
FILES:${PN}-templates += "${datadir}/${PN}-${SHRT_VER}/templates"
PACKAGES_DYNAMIC += "^${PN}-meta.* ^${PN}-plugin-.*"
python populate_packages:prepend () {
abiword_libdir = d.expand('${libdir}/${PN}-${SHRT_VER}/plugins')
do_split_packages(d, abiword_libdir, '(.*)\.so$', 'abiword-plugin-%s', 'Abiword plugin for %s', extra_depends='')
metapkg = "abiword-meta"
d.setVar('ALLOW_EMPTY:' + metapkg, "1")
d.setVar('FILES:' + metapkg, "")
blacklist = [ 'abiword-plugins-dbg', 'abiword-plugins', 'abiword-plugins-doc', 'abiword-plugins-dev', 'abiword-plugins-locale' ]
metapkg_rdepends = []
packages = d.getVar('PACKAGES').split()
for pkg in packages[1:]:
if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count("-dev") and not pkg.count("-dbg") and not pkg.count("static") and not pkg.count("locale") and not pkg.count("abiword-doc"):
print("Modifying %s" % pkg)
metapkg_rdepends.append(pkg)
d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
d.setVar('DESCRIPTION:' + metapkg, 'abiword-plugin meta package')
packages.append(metapkg)
d.setVar('PACKAGES', ' '.join(packages))
}
FILES:${PN}-plugin-openxml += "${datadir}/${PN}-${SHRT_VER}/omml_xslt"

2
recipes-devtools/archive-zip/archive-zip_1.31.bb
View File

@@ -1,6 +1,6 @@
DESCRIPTION = "perl interface to ZIP archive files"
SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
LICENSE = "Artistic-1.0 | GPL-1.0+"
LIC_FILES_CHKSUM = "file://LICENSE;md5=385c55653886acac3821999a3ccd17b3"
PATCHREV = "04"

0
appends/cppunit/cppunit_%.bbappend → recipes-devtools/cppunit/cppunit_%.bbappend
View File

6
recipes-filter/libabw/libabw_0.1.3.bb → recipes-filter/libabw/libabw_0.1.1.bb
View File

@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "0ec0331abbbf653f08eecceb1fb787a0"
SRC_URI[sha256sum] = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed"
SRC_URI[md5sum] = "6be55a46078b593ec20cad9bb8730c3e"
SRC_URI[sha256sum] = "cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e"
inherit autotools pkgconfig
@@ -16,3 +16,5 @@ DEPENDS = " \
libxml2 \
librevenge \
"
BBCLASSEXTEND = "native"

40
recipes-filter/libcdr/libcdr/0001-Fix-build-with-ICU-68.patch
View File

@@ -1,40 +0,0 @@
From 489797a235041ca43a288f5ce38aace8975bc987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 24 Nov 2020 22:23:42 +0100
Subject: [PATCH] Fix build with ICU >= 68
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/libcdr_utils.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
index 09ab42e..54a6fa3 100644
--- a/src/lib/libcdr_utils.cpp
+++ b/src/lib/libcdr_utils.cpp
@@ -97,6 +97,17 @@ static unsigned short getEncodingFromICUName(const char *name)
return 0;
}
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLength)
{
if (!buffer)
--
2.26.2

11
recipes-filter/libcdr/libcdr_0.1.7.bb → recipes-filter/libcdr/libcdr_0.1.4.bb
View File

@@ -4,12 +4,13 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
https://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-ICU-68.patch \
"
SRC_URI[sha256sum] = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b8ecdd4"
SRC_URI = "http://dev-www.libreoffice.org/src/libcdr/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "4e52342983d798ae584e26bdf7a5f18a"
SRC_URI[sha256sum] = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"
inherit autotools pkgconfig
DEPENDS = "icu lcms librevenge"
BBCLASSEXTEND = "native"

58
recipes-filter/libe-book/files/0001-make-nitpickickng-gcc6-happy.patch Normal file
View File

@@ -0,0 +1,58 @@
From f443422e9f039b809bd4fcde21704b9d6503edfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 31 Jul 2016 12:57:24 +0200
Subject: [PATCH] make nitpickickng gcc6 happy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upsatream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
src/lib/FB2Parser.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/FB2Parser.cpp b/src/lib/FB2Parser.cpp
index 6442c70..1450087 100644
--- a/src/lib/FB2Parser.cpp
+++ b/src/lib/FB2Parser.cpp
@@ -103,7 +103,7 @@ private:
bool m_firstBody;
};
-class StylesheetContext : public FB2NodeContextBase
+/*class StylesheetContext : public FB2NodeContextBase
{
public:
explicit StylesheetContext(FB2ParserContext *parentContext);
@@ -112,7 +112,7 @@ private:
virtual FB2XMLParserContext *element(const FB2TokenData &name, const FB2TokenData &ns);
virtual void endOfElement();
virtual void attribute(const FB2TokenData &name, const FB2TokenData *ns, const char *value);
-};
+};*/
}
@@ -216,7 +216,7 @@ void FictionBookGathererContext::attribute(const FB2TokenData &, const FB2TokenD
{
}
-StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext)
+/*StylesheetContext::StylesheetContext(FB2ParserContext *const parentContext)
: FB2NodeContextBase(parentContext)
{
}
@@ -253,7 +253,7 @@ void StylesheetContext::attribute(const FB2TokenData &name, const FB2TokenData *
break;
}
}
-}
+}*/
DocumentContext::DocumentContext(FB2ContentMap &notes, FB2ContentMap &bitmaps, librevenge::RVNGTextInterface *const document)
: FB2ParserContext(0)
--
2.5.5

38
recipes-filter/libe-book/libe-book/0001-Fix-build-with-ICU-68.patch
View File

@@ -1,38 +0,0 @@
From 70a92974df1d3b35811c2354fcec00c791159b82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 24 Nov 2020 22:38:21 +0100
Subject: [PATCH] Fix build with ICU >= 68
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/EBOOKCharsetConverter.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp
index 0d85fa3..2631ba4 100644
--- a/src/lib/EBOOKCharsetConverter.cpp
+++ b/src/lib/EBOOKCharsetConverter.cpp
@@ -26,6 +26,17 @@ class ConverterException
{
};
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
/** Guess character set of the text.
@param[in] text the text
--
2.26.2

19
recipes-filter/libe-book/libe-book_0.1.2.bb Normal file
View File

@@ -0,0 +1,19 @@
SUMMARY = "A library for import of reflowable e-book formats"
HOMEPAGE = "http://sourceforge.net/projects/libebook"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/libebook/${BPN}-${PV}/${BPN}-${PV}.tar.xz \
file://0001-make-nitpickickng-gcc6-happy.patch \
"
SRC_URI[md5sum] = "19d84f4a97aab32d350d1f47ea3da0b3"
SRC_URI[sha256sum] = "7f894b1538b71c6cd96c976069c4dadb38b623612f0e35b2f6ee8a2c46bb88ec"
inherit autotools pkgconfig
DEPENDS = "icu libxml2 librevenge boost-native gperf-native"
BBCLASSEXTEND = "native"

17
recipes-filter/libe-book/libe-book_0.1.3.bb
View File

@@ -1,17 +0,0 @@
SUMMARY = "A library for import of reflowable e-book formats"
HOMEPAGE = "http://sourceforge.net/projects/libebook"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-ICU-68.patch \
"
SRC_URI[md5sum] = "2956f1c5e7950b0018979a132165da8b"
SRC_URI[sha256sum] = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"
inherit autotools pkgconfig
DEPENDS = "icu libxml2 librevenge liblangtag boost-native gperf-native"

28
recipes-filter/libetonyek/libetonyek/0001-Fix-build-with-gcc-10.patch
View File

@@ -1,28 +0,0 @@
From 4e4e9ac5990ff2436ed127eff6690b06a68bd034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 5 Jun 2020 17:35:01 +0200
Subject: [PATCH] Fix build with gcc 10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/NUM3Parser.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/NUM3Parser.cpp b/src/lib/NUM3Parser.cpp
index 6dc0e9a..8290290 100644
--- a/src/lib/NUM3Parser.cpp
+++ b/src/lib/NUM3Parser.cpp
@@ -8,6 +8,7 @@
*/
#include <functional>
+#include <algorithm>
#include "NUM3Parser.h"
--
2.26.2

15
recipes-filter/libetonyek/libetonyek_0.1.7.bb Normal file
View File

@@ -0,0 +1,15 @@
SUMMARY = "A library for import of import of Apple iWork documents"
HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
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[md5sum] = "3088732de0028b1340668b8a3caf3c25"
SRC_URI[sha256sum] = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"
inherit autotools pkgconfig
DEPENDS = "glm mdds icu lcms libxml2 librevenge liblangtag mdds-1"
BBCLASSEXTEND = "native"

15
recipes-filter/libetonyek/libetonyek_0.1.9.bb
View File

@@ -1,15 +0,0 @@
SUMMARY = "A library for import of import of Apple iWork documents"
HOMEPAGE = "http://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=815ca599c9df247a0c7f619bab123dad"
SRC_URI = " \
http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-gcc-10.patch \
"
SRC_URI[md5sum] = "b891c14c5233f93fb7db052b5762a692"
SRC_URI[sha256sum] = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a"
inherit autotools pkgconfig
DEPENDS = "glm icu lcms libxml2 librevenge liblangtag mdds-1.2"

32
recipes-filter/libfreehand/files/0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch
View File

@@ -1,32 +0,0 @@
From af65e7374d6d5058e46b9173efdedfc661f451b7 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
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

32
recipes-filter/libfreehand/files/0002-Fix-build-with-gcc-9.patch
View File

@@ -1,32 +0,0 @@
From da4a016b7e9c03f36657f684ae62d33fc5a94f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 6 Jun 2019 22:09:44 +0200
Subject: [PATCH] Fix build with gcc 9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| ../../../libfreehand-0.1.2/src/lib/FHCollector.cpp:285:68: error: implicitly-declared 'constexpr libfreehand::FHTransform& libfreehand::FHTransform::operator=(const libfreehand::FHTransform&)' is deprecated [-Werror=deprecated-copy]
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/FHTransform.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/FHTransform.h b/src/lib/FHTransform.h
index a53e13a..47f40f7 100644
--- a/src/lib/FHTransform.h
+++ b/src/lib/FHTransform.h
@@ -20,6 +20,7 @@ struct FHTransform
FHTransform();
FHTransform(double m11, double m21, double m12, double m22, double m13, double m23);
FHTransform(const FHTransform &trafo);
+ FHTransform& operator=(const FHTransform& other) = default;
void applyToPoint(double &x, double &y) const;
void applyToArc(double &rx, double &ry, double &rotation, bool &sweep, double &endx, double &endy) const;
--
2.20.1

32
recipes-filter/libfreehand/files/0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
View File

@@ -1,32 +0,0 @@
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>
Upstream-Status: Applied
---
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

9
recipes-filter/libfreehand/libfreehand_0.1.2.bb
View File

@@ -4,15 +4,12 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-WaE-unnecessary-parentheses-in-declaration-of-paddin.patch \
file://0002-Fix-build-with-gcc-9.patch \
file://0003-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "c3788f5686839fd097bd77d8f51c3d04"
SRC_URI[sha256sum] = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"
inherit autotools pkgconfig
DEPENDS = "icu lcms librevenge gperf-native"
BBCLASSEXTEND = "native"

4
recipes-filter/libgltf/libgltf_0.0.2.bb
View File

@@ -4,14 +4,10 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=9741c346eef56131163e13b9db1241b3 \
"
# Note there is a later version (0.1.0 currently) available but libreoffice
# asks for 0.0 explicitly
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "d63a9f47ab048f5009d90693d6aa6424"
SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"
inherit autotools pkgconfig
CXXFLAGS += "-std=c++11 -DGLM_ENABLE_EXPERIMENTAL=1"
DEPENDS = "glew glm boost"

30
recipes-filter/libmspub/libmspub/0001-Fix-build-with-gcc-10.patch
View File

@@ -1,30 +0,0 @@
From d70bd0844f3e2160dac8538446eb437dc988e4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 5 Jun 2020 16:51:32 +0200
Subject: [PATCH] Fix build with gcc 10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/MSPUBMetaData.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
index 9167f4f..7825e37 100644
--- a/src/lib/MSPUBMetaData.h
+++ b/src/lib/MSPUBMetaData.h
@@ -13,6 +13,7 @@
#include <map>
#include <utility>
#include <vector>
+#include <cstdint>
#include <librevenge/librevenge.h>
--
2.26.2

9
recipes-filter/libmspub/libmspub_0.1.4.bb → recipes-filter/libmspub/libmspub_0.1.2.bb
View File

@@ -4,12 +4,9 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-Fix-build-with-gcc-10.patch \
"
SRC_URI[md5sum] = "ac6fa9c1c05ece27c58c05e11786fd3a"
SRC_URI[sha256sum] = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "050b8b29c2620fdbfb5d8561d4d08a11"
SRC_URI[sha256sum] = "b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f"
inherit autotools pkgconfig

682
recipes-filter/libmwaw/files/0001-gcc7-try-to-correct-some-warnings.patch Normal file
View File

@@ -0,0 +1,682 @@
From d64c828a70514147622fab3049ffad93449e7750 Mon Sep 17 00:00:00 2001
From: osnola <alonso@loria.fr>
Date: Sun, 2 Jul 2017 10:03:30 +0200
Subject: [PATCH 1/2] gcc7: try to correct some warnings...
---
autogen.sh | 2 +-
src/lib/BeagleWksDBParser.cxx | 1 +
src/lib/ClarisDrawText.cxx | 3 ++-
src/lib/ClarisWksText.cxx | 3 ++-
src/lib/HanMacWrdJParser.cxx | 4 ++--
src/lib/HanMacWrdKGraph.cxx | 1 +
src/lib/HanMacWrdKParser.cxx | 5 +++--
src/lib/MWAWCell.cxx | 2 ++
src/lib/MWAWChart.cxx | 1 +
src/lib/MWAWGraphicListener.cxx | 4 ++--
src/lib/MWAWGraphicShape.cxx | 2 +-
src/lib/MWAWPageSpan.cxx | 1 +
src/lib/MWAWPresentationListener.cxx | 4 ++--
src/lib/MWAWSpreadsheetListener.cxx | 8 ++++----
src/lib/MWAWTextListener.cxx | 10 +++++-----
src/lib/MacDraft5Parser.cxx | 2 +-
src/lib/MacDrawProParser.cxx | 4 ++--
src/lib/MacDrawProStyleManager.cxx | 4 ++--
src/lib/MarinerWrtGraph.cxx | 3 ++-
src/lib/MarinerWrtText.cxx | 2 +-
src/lib/MoreText.cxx | 1 +
src/lib/MsWksDBParser.cxx | 1 +
src/lib/MsWksGraph.cxx | 5 +++--
src/lib/MsWksSSParser.cxx | 1 +
src/lib/PowerPoint1Parser.cxx | 2 +-
src/lib/PowerPoint3Parser.cxx | 2 +-
src/lib/RagTime5Graph.cxx | 2 +-
src/lib/RagTime5Parser.cxx | 2 +-
src/lib/RagTimeSpreadsheet.cxx | 8 ++++----
src/lib/WriterPlsParser.cxx | 2 +-
src/lib/ZWrtText.cxx | 1 +
src/lib/libmwaw_internal.cxx | 7 +++++--
src/lib/libmwaw_internal.hxx | 15 +++++++++++++++
33 files changed, 74 insertions(+), 41 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index aededbc..3182b42 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -21,7 +21,7 @@ for i in $TESTLIBTOOLIZE; do
done
if [ "$LIBTOOLIZEFOUND" = "0" ]; then
- echo "$0: need libtoolize tool to build lilbmwaw" >&2
+ echo "$0: need libtoolize tool to build libmwaw" >&2
exit 1
fi
diff --git a/src/lib/BeagleWksDBParser.cxx b/src/lib/BeagleWksDBParser.cxx
index 3e6ce53..efaf283 100644
--- a/src/lib/BeagleWksDBParser.cxx
+++ b/src/lib/BeagleWksDBParser.cxx
@@ -1009,6 +1009,7 @@ bool BeagleWksDBParser::readRow()
if (fSz>20) break;
val=static_cast<int>(input->readULong(2));
if (val) f << "g0=" << std::hex << val << std::dec << ",";
+ FALLTHROUGH;
case BeagleWksDBParserInternal::Cell::Memo: // memoId
case BeagleWksDBParserInternal::Cell::Picture: // pictId
case BeagleWksDBParserInternal::Cell::Number:
diff --git a/src/lib/ClarisDrawText.cxx b/src/lib/ClarisDrawText.cxx
index aef88d4..f032414 100644
--- a/src/lib/ClarisDrawText.cxx
+++ b/src/lib/ClarisDrawText.cxx
@@ -520,7 +520,7 @@ shared_ptr<ClarisWksStruct::DSET> ClarisDrawText::readDSETZone(ClarisWksStruct::
textZone->m_position = ClarisWksStruct::DSET::P_Main;
break;
}
- // fail through intended
+ FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("ClarisDrawText::readDSETZone: find unknown position %d\n", (textZone->m_textType >> 4)));
f << "#position="<< (textZone->m_textType >> 4) << ",";
@@ -1358,6 +1358,7 @@ bool ClarisDrawText::sendText(ClarisDrawTextInternal::DSET const &zone, int subZ
}
MWAW_DEBUG_MSG(("ClarisDrawText::sendText: Find unexpected char 1\n"));
f << "###";
+ FALLTHROUGH;
case 0xb: // page break
MWAW_DEBUG_MSG(("ClarisDrawText::sendText: Find unexpected page break\n"));
f << "###pb";
diff --git a/src/lib/ClarisWksText.cxx b/src/lib/ClarisWksText.cxx
index 6b3eb0b..41bf87d 100644
--- a/src/lib/ClarisWksText.cxx
+++ b/src/lib/ClarisWksText.cxx
@@ -754,7 +754,7 @@ shared_ptr<ClarisWksStruct::DSET> ClarisWksText::readDSETZone(ClarisWksStruct::D
textZone->m_position = ClarisWksStruct::DSET::P_Main;
break;
}
- // fail through intended
+ FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("ClarisWksText::readDSETZone: find unknown position %d\n", (textZone->m_textType >> 4)));
f << "#position="<< (textZone->m_textType >> 4) << ",";
@@ -1788,6 +1788,7 @@ bool ClarisWksText::sendText(ClarisWksTextInternal::Zone const &zone, MWAWListen
}
MWAW_DEBUG_MSG(("ClarisWksText::sendText: Find unexpected char 1\n"));
f << "###";
+ FALLTHROUGH;
case 0xb: // page break
numSectionInPage = 0;
if (main)
diff --git a/src/lib/HanMacWrdJParser.cxx b/src/lib/HanMacWrdJParser.cxx
index 166125f..2f7680d 100644
--- a/src/lib/HanMacWrdJParser.cxx
+++ b/src/lib/HanMacWrdJParser.cxx
@@ -650,8 +650,8 @@ bool HanMacWrdJParser::readPrintInfo(MWAWEntry const &entry)
MWAWVec2i paperSize = info.paper().size();
MWAWVec2i pageSize = info.page().size();
- bool useDocInfo = (dim[3]-dim[1]>margins[2]+margins[0]) &&
- (dim[2]-dim[0]>margins[2]+margins[0]);
+ bool useDocInfo = (float(dim[3]-dim[1])>margins[2]+margins[0]) &&
+ (float(dim[2]-dim[0])>margins[3]+margins[1]);
bool usePrintInfo = pageSize.x() > 0 && pageSize.y() > 0 &&
paperSize.x() > 0 && paperSize.y() > 0;
diff --git a/src/lib/HanMacWrdKGraph.cxx b/src/lib/HanMacWrdKGraph.cxx
index fa4b07d..fe4a3e2 100644
--- a/src/lib/HanMacWrdKGraph.cxx
+++ b/src/lib/HanMacWrdKGraph.cxx
@@ -1260,6 +1260,7 @@ bool HanMacWrdKGraph::sendFrame(HanMacWrdKGraphInternal::Frame const &frame, MWA
return true;
}
}
+ FALLTHROUGH;
case 10:
return sendTextBox(static_cast<HanMacWrdKGraphInternal::TextBox const &>(frame), pos);
case 6: {
diff --git a/src/lib/HanMacWrdKParser.cxx b/src/lib/HanMacWrdKParser.cxx
index 18239f1..ef9bd88 100644
--- a/src/lib/HanMacWrdKParser.cxx
+++ b/src/lib/HanMacWrdKParser.cxx
@@ -507,6 +507,7 @@ bool HanMacWrdKParser::readZone(shared_ptr<HanMacWrdKZone> zone)
case 0xc:
if (readZonec(zone))
return true;
+ FALLTHROUGH;
case 0xd:
if (m_graphParser->readPicture(zone))
return true;
@@ -586,8 +587,8 @@ bool HanMacWrdKParser::readPrintInfo(HanMacWrdKZone &zone)
MWAWVec2i paperSize = info.paper().size();
MWAWVec2i pageSize = info.page().size();
- bool useDocInfo = (dim[3]-dim[1]>margins[2]+margins[0]) &&
- (dim[2]-dim[0]>margins[2]+margins[0]);
+ bool useDocInfo = (float(dim[3]-dim[1])>margins[2]+margins[0]) &&
+ (float(dim[2]-dim[0])>margins[3]+margins[1]);
bool usePrintInfo = pageSize.x() > 0 && pageSize.y() > 0 &&
paperSize.x() > 0 && paperSize.y() > 0;
diff --git a/src/lib/MWAWCell.cxx b/src/lib/MWAWCell.cxx
index f1c5a3e..645ab18 100644
--- a/src/lib/MWAWCell.cxx
+++ b/src/lib/MWAWCell.cxx
@@ -641,6 +641,8 @@ bool MWAWCellContent::double2String(double val, MWAWCell::Format const &format,
time.tm_zone=0;
#endif
char buf[256];
+#pragma GCC diagnostic ignored "-Wformat-y2k"
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
if (mktime(&time)==-1 ||
!strftime(buf, 256, format.m_DTFormat.empty() ? "%m/%d/%y" : format.m_DTFormat.c_str(), &time))
return false;
diff --git a/src/lib/MWAWChart.cxx b/src/lib/MWAWChart.cxx
index 3ca98bd..c9b6e6d 100644
--- a/src/lib/MWAWChart.cxx
+++ b/src/lib/MWAWChart.cxx
@@ -624,6 +624,7 @@ std::ostream &operator<<(std::ostream &o, MWAWChart::TextZone const &zone)
switch (zone.m_type) {
case MWAWChart::TextZone::T_SubTitle:
o << "sub";
+ FALLTHROUGH;
case MWAWChart::TextZone::T_Title:
o << "title";
if (zone.m_contentType==MWAWChart::TextZone::C_Cell)
diff --git a/src/lib/MWAWGraphicListener.cxx b/src/lib/MWAWGraphicListener.cxx
index da8e8e1..6b723e8 100644
--- a/src/lib/MWAWGraphicListener.cxx
+++ b/src/lib/MWAWGraphicListener.cxx
@@ -1480,7 +1480,7 @@ void MWAWGraphicListener::_handleFrameParameters(librevenge::RVNGPropertyList &l
switch (pos.m_yPos) {
case MWAWPosition::YFull:
list.insert("svg:height", double(h), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
list.insert("style:vertical-pos", "from-top");
@@ -1522,7 +1522,7 @@ void MWAWGraphicListener::_handleFrameParameters(librevenge::RVNGPropertyList &l
switch (pos.m_xPos) {
case MWAWPosition::XFull:
list.insert("svg:width", double(w), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
list.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWGraphicShape.cxx b/src/lib/MWAWGraphicShape.cxx
index 22b3c55..f1e7418 100644
--- a/src/lib/MWAWGraphicShape.cxx
+++ b/src/lib/MWAWGraphicShape.cxx
@@ -596,7 +596,7 @@ std::vector<MWAWGraphicShape::PathData> MWAWGraphicShape::getPath(bool forTransf
switch (m_type) {
case Measure:
MWAW_DEBUG_MSG(("MWAWGraphicShape::getPath: called on a measure, transform it in line\n"));
- // fall through expected
+ FALLTHROUGH;
case Line:
case Polygon: {
size_t n=m_vertices.size();
diff --git a/src/lib/MWAWPageSpan.cxx b/src/lib/MWAWPageSpan.cxx
index 79611cf..b1064c4 100644
--- a/src/lib/MWAWPageSpan.cxx
+++ b/src/lib/MWAWPageSpan.cxx
@@ -226,6 +226,7 @@ void MWAWPageSpan::setHeaderFooter(MWAWHeaderFooter const &hF)
switch (hF.m_occurrence) {
case MWAWHeaderFooter::NEVER:
removeHeaderFooter(type, MWAWHeaderFooter::ALL);
+ FALLTHROUGH;
case MWAWHeaderFooter::ALL:
removeHeaderFooter(type, MWAWHeaderFooter::ODD);
removeHeaderFooter(type, MWAWHeaderFooter::EVEN);
diff --git a/src/lib/MWAWPresentationListener.cxx b/src/lib/MWAWPresentationListener.cxx
index 705ca60..23542cd 100644
--- a/src/lib/MWAWPresentationListener.cxx
+++ b/src/lib/MWAWPresentationListener.cxx
@@ -1489,7 +1489,7 @@ void MWAWPresentationListener::_handleFrameParameters(librevenge::RVNGPropertyLi
switch (pos.m_yPos) {
case MWAWPosition::YFull:
list.insert("svg:height", double(h), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
list.insert("style:vertical-pos", "from-top");
@@ -1531,7 +1531,7 @@ void MWAWPresentationListener::_handleFrameParameters(librevenge::RVNGPropertyLi
switch (pos.m_xPos) {
case MWAWPosition::XFull:
list.insert("svg:width", double(w), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
list.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWSpreadsheetListener.cxx b/src/lib/MWAWSpreadsheetListener.cxx
index c8c7592..f454fb8 100644
--- a/src/lib/MWAWSpreadsheetListener.cxx
+++ b/src/lib/MWAWSpreadsheetListener.cxx
@@ -1054,7 +1054,7 @@ void MWAWSpreadsheetListener::insertShape
default:
#endif
MWAW_DEBUG_MSG(("MWAWSpreadsheetListener::insertShape: UNKNOWN position, insert as char position\n"));
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1171,7 +1171,7 @@ bool MWAWSpreadsheetListener::openFrame(MWAWPosition const &pos, MWAWGraphicStyl
break;
case MWAWPosition::Unknown:
MWAW_DEBUG_MSG(("MWAWSpreadsheetListener::openFrame: UNKNOWN position, insert as char position\n"));
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1346,7 +1346,7 @@ void MWAWSpreadsheetListener::_handleFrameParameters
switch (pos.m_yPos) {
case MWAWPosition::YFull:
propList.insert("svg:height", double(h), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
propList.insert("style:vertical-pos", "from-top");
@@ -1388,7 +1388,7 @@ void MWAWSpreadsheetListener::_handleFrameParameters
switch (pos.m_xPos) {
case MWAWPosition::XFull:
propList.insert("svg:width", double(w), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
propList.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWTextListener.cxx b/src/lib/MWAWTextListener.cxx
index 2294d1b..151f64a 100644
--- a/src/lib/MWAWTextListener.cxx
+++ b/src/lib/MWAWTextListener.cxx
@@ -1139,7 +1139,7 @@ void MWAWTextListener::insertShape
default:
#endif
MWAW_DEBUG_MSG(("MWAWTextListener::insertShape: UNKNOWN position, insert as char position\n"));
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1255,7 +1255,7 @@ bool MWAWTextListener::openFrame(MWAWPosition const &pos, MWAWGraphicStyle const
break;
case MWAWPosition::Unknown:
MWAW_DEBUG_MSG(("MWAWTextListener::openFrame: UNKNOWN position, insert as char position\n"));
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1339,7 +1339,7 @@ bool MWAWTextListener::openGroup(MWAWPosition const &pos)
default:
#endif
MWAW_DEBUG_MSG(("MWAWTextListener::openGroup: UNKNOWN position, insert as char position\n"));
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1490,7 +1490,7 @@ void MWAWTextListener::_handleFrameParameters
switch (pos.m_yPos) {
case MWAWPosition::YFull:
propList.insert("svg:height", double(h), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
propList.insert("style:vertical-pos", "from-top");
@@ -1532,7 +1532,7 @@ void MWAWTextListener::_handleFrameParameters
switch (pos.m_xPos) {
case MWAWPosition::XFull:
propList.insert("svg:width", double(w), unit);
- // fallthrough intended
+ FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
propList.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MacDraft5Parser.cxx b/src/lib/MacDraft5Parser.cxx
index 2baeed9..6c11d41 100644
--- a/src/lib/MacDraft5Parser.cxx
+++ b/src/lib/MacDraft5Parser.cxx
@@ -1473,7 +1473,7 @@ bool MacDraft5Parser::readObject(MacDraft5ParserInternal::Layout &layout)
shape->m_shape=MWAWGraphicShape::rectangle(MWAWBox2f(listPts[0], listPts[2]), corner);
break;
}
- // fall through intended
+ FALLTHROUGH;
case 0x3:
case 0x4: {
rotation=0;
diff --git a/src/lib/MacDrawProParser.cxx b/src/lib/MacDrawProParser.cxx
index e8b9b9b..91c70fa 100644
--- a/src/lib/MacDrawProParser.cxx
+++ b/src/lib/MacDrawProParser.cxx
@@ -1310,7 +1310,7 @@ int MacDrawProParser::readObject()
f << "bitmap,";
break;
}
- // fall through intended
+ FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("MacDrawProParser::readObject: find unknown type %d\n", val));
f << "###type=" << std::hex << val << std::dec << ",";
@@ -2230,7 +2230,7 @@ bool MacDrawProParser::readGeometryShapeData(MacDrawProParserInternal::Shape &sh
shape.m_shape.m_path.push_back(MWAWGraphicShape::PathData('L', listVertices.back()));
break;
}
- // fall through intended
+ FALLTHROUGH;
case 9: { // spline
if (remain<=2) {
MWAW_DEBUG_MSG(("MacDrawProParser::readGeometryShapeData: can not read compute the number of point in spline\n"));
diff --git a/src/lib/MacDrawProStyleManager.cxx b/src/lib/MacDrawProStyleManager.cxx
index 88940ce..9fa242b 100644
--- a/src/lib/MacDrawProStyleManager.cxx
+++ b/src/lib/MacDrawProStyleManager.cxx
@@ -2442,7 +2442,7 @@ bool MacDrawProStyleManager::readGradientMap(MWAWEntry const &entry, int N, int
break;
case 1:
gradient.m_type = MWAWGraphicStyle::G_Radial;
- // fall through expected
+ FALLTHROUGH;
case 2: {
if (type==2) gradient.m_type = MWAWGraphicStyle::G_Rectangular;
int dim[4]; // square which defined the center rectangle
@@ -2554,7 +2554,7 @@ bool MacDrawProStyleManager::readGradientPalette(MWAWEntry const &entry, int fie
break;
case 1:
f << "concentric,";
- // fall through expected
+ FALLTHROUGH;
case 2: {
if (type==2) f << "radial,";
int dim[4]; // square which defined the center rectangle
diff --git a/src/lib/MarinerWrtGraph.cxx b/src/lib/MarinerWrtGraph.cxx
index 1444e0f..fc9ecd0 100644
--- a/src/lib/MarinerWrtGraph.cxx
+++ b/src/lib/MarinerWrtGraph.cxx
@@ -130,7 +130,7 @@ struct Token {
switch (m_pictBorderType[i]) {
case 1: // single[w=0.5]
border.m_width = 0.5;
- // fallthrough intended
+ FALLTHROUGH;
case 2:
border.m_style = MWAWBorder::Simple;
break;
@@ -1024,6 +1024,7 @@ bool MarinerWrtGraph::readTokenBlock0(MarinerWrtStruct const &data, MarinerWrtGr
case 0x18:
val = input->readLong(2);
if (val) f << "f0=" << val << ","; // fieldType?
+ FALLTHROUGH;
case 0x19:
case 0x1e:
case 0x1f:
diff --git a/src/lib/MarinerWrtText.cxx b/src/lib/MarinerWrtText.cxx
index a65e033..6d2e097 100644
--- a/src/lib/MarinerWrtText.cxx
+++ b/src/lib/MarinerWrtText.cxx
@@ -235,7 +235,7 @@ MWAWBorder Paragraph::BorderFill::getBorder(int i) const
break;
case 1: // single[w=0.5]
res.m_width = 0.5;
- // fall-through intended
+ FALLTHROUGH;
case 2:
res.m_style = MWAWBorder::Simple;
break;
diff --git a/src/lib/MoreText.cxx b/src/lib/MoreText.cxx
index 8410dbc..c70fc77 100644
--- a/src/lib/MoreText.cxx
+++ b/src/lib/MoreText.cxx
@@ -2050,6 +2050,7 @@ bool MoreText::readTabs(MWAWEntry const &entry, MoreTextInternal::Paragraph &par
break;
case 3: // more large space
f2 << "dot[large],";
+ FALLTHROUGH;
case 2:
tab.m_leaderCharacter = '.';
break;
diff --git a/src/lib/MsWksDBParser.cxx b/src/lib/MsWksDBParser.cxx
index 785162d..1e67458 100644
--- a/src/lib/MsWksDBParser.cxx
+++ b/src/lib/MsWksDBParser.cxx
@@ -1143,6 +1143,7 @@ bool MsWksDBParser::readFormTypes(MsWksDBParserInternal::Form &form)
visible = MsWksDBParserInternal::V_HEADER;
break;
}
+ FALLTHROUGH;
default:
f << "##unkn[visible]=" << hiFlag << ",";
break;
diff --git a/src/lib/MsWksGraph.cxx b/src/lib/MsWksGraph.cxx
index 9ffaf84..bb70d52 100644
--- a/src/lib/MsWksGraph.cxx
+++ b/src/lib/MsWksGraph.cxx
@@ -1227,6 +1227,7 @@ bool MsWksGraph::readPictHeader(MsWksGraphInternal::Zone &pict)
switch (lineFlags&3) {
case 2:
style.m_arrows[0]=MWAWGraphicStyle::Arrow::plain();
+ FALLTHROUGH;
case 1:
style.m_arrows[1]=MWAWGraphicStyle::Arrow::plain();
break;
@@ -1897,7 +1898,7 @@ void MsWksGraph::computePositions(int zoneId, std::vector<int> &linesH, std::vec
h+=middleH;
int p = 0;
while (p < nPages) {
- if (h < pagesH[size_t(p)]) break;
+ if (h < float(pagesH[size_t(p)])) break;
h -= float(pagesH[size_t(p++)]);
}
zone->m_page = p;
@@ -1988,7 +1989,7 @@ bool MsWksGraph::readRB(MWAWInputStreamPtr input, MWAWEntry const &entry, int ki
case 2:
if (input->readLong(1)!=3) return false;
f << "id=" << input->readLong(1) << ",";
- // no jump expected
+ FALLTHROUGH;
case 1: {
unsigned long dSz=input->readULong(4);
beginRB=input->tell();
diff --git a/src/lib/MsWksSSParser.cxx b/src/lib/MsWksSSParser.cxx
index 72efc00..271a5c7 100644
--- a/src/lib/MsWksSSParser.cxx
+++ b/src/lib/MsWksSSParser.cxx
@@ -933,6 +933,7 @@ bool MsWksSSParser::readCell(int sz, MWAWVec2i const &cellPos, MsWksSSParserInte
break;
case 3:
f << "type" << type << ",";
+ FALLTHROUGH;
case 2: //number general
format.m_format=MWAWCell::F_NUMBER;
content.m_contentType=MWAWCellContent::C_FORMULA;
diff --git a/src/lib/PowerPoint1Parser.cxx b/src/lib/PowerPoint1Parser.cxx
index d5ac56b..8796de0 100644
--- a/src/lib/PowerPoint1Parser.cxx
+++ b/src/lib/PowerPoint1Parser.cxx
@@ -2537,7 +2537,7 @@ bool PowerPoint1Parser::sendFrame(PowerPoint1ParserInternal::Frame const &frame,
if (frame.m_type==0)
shape=MWAWGraphicShape::line(fBox[0], fBox[1]);
else {
- if (frame.m_cornerSize >= fBox.size()[0] || frame.m_cornerSize >= fBox.size()[1])
+ if (float(frame.m_cornerSize) >= fBox.size()[0] || float(frame.m_cornerSize) >= fBox.size()[1])
shape=MWAWGraphicShape::circle(fBox);
else
shape=MWAWGraphicShape::rectangle(fBox, MWAWVec2f(float(frame.m_cornerSize)/2.f, float(frame.m_cornerSize)/2.f));
diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
index da2c8eb..81b15f2 100644
--- a/src/lib/PowerPoint3Parser.cxx
+++ b/src/lib/PowerPoint3Parser.cxx
@@ -2952,7 +2952,7 @@ bool PowerPoint3Parser::readParagraph(MWAWParagraph &para, PowerPoint3ParserInte
}
val &= 0xbf;
}
- // fall through expected
+ FALLTHROUGH;
default:
if (val)
f << std::hex << val << std::dec << ",";
diff --git a/src/lib/RagTime5Graph.cxx b/src/lib/RagTime5Graph.cxx
index 86da24a..4d0c838 100644
--- a/src/lib/RagTime5Graph.cxx
+++ b/src/lib/RagTime5Graph.cxx
@@ -665,7 +665,7 @@ bool RagTime5Graph::readColorPatternZone(RagTime5ClusterManager::Cluster &cluste
RagTime5ClusterManager::Link const &lnk=cluster.m_linksList[i];
shared_ptr<RagTime5Zone> data=m_mainParser.getDataZone(lnk.m_ids[0]);
if (!data || !data->m_entry.valid()) {
- if (lnk.m_N*lnk.m_fieldSize) {
+ if (lnk.m_N && lnk.m_fieldSize) {
MWAW_DEBUG_MSG(("RagTime5Graph::readColorPatternZone: can not find data zone %d\n", lnk.m_ids[0]));
}
continue;
diff --git a/src/lib/RagTime5Parser.cxx b/src/lib/RagTime5Parser.cxx
index 08f13db..9af4803 100644
--- a/src/lib/RagTime5Parser.cxx
+++ b/src/lib/RagTime5Parser.cxx
@@ -1241,7 +1241,7 @@ bool RagTime5Parser::readClusterLinkList(RagTime5Zone &zone, RagTime5ClusterMana
{
listLinks.clear();
if (!zone.m_entry.valid()) {
- if (link.m_N*link.m_fieldSize) {
+ if (link.m_N && link.m_fieldSize) {
MWAW_DEBUG_MSG(("RagTime5Parser::readClusterLinkList: can not find data zone %d\n", link.m_ids[0]));
}
return false;
diff --git a/src/lib/RagTimeSpreadsheet.cxx b/src/lib/RagTimeSpreadsheet.cxx
index c5bbbd3..2f22f2b 100644
--- a/src/lib/RagTimeSpreadsheet.cxx
+++ b/src/lib/RagTimeSpreadsheet.cxx
@@ -1415,9 +1415,9 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
break;
case 0x81:
f << "float81,";
- // fall through intended
+ FALLTHROUGH;
case 3:
- // fall through intended
+ FALLTHROUGH;
case 1: {
if (type==3) {
format.m_format=MWAWCell::F_DATE; // we need the format to choose between date and time
@@ -1444,7 +1444,7 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
}
case 0x24:
f << "text2,";
- // fall through intended
+ FALLTHROUGH;
case 4: {
format.m_format=MWAWCell::F_TEXT;
content.m_textEntry.setBegin(input->tell());
@@ -1483,7 +1483,7 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
}
case 0x51:
f << "long51,";
- // fall through intended
+ FALLTHROUGH;
case 0x11: // or 2 int?
if (pos+5>endPos) {
ok=false;
diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
index 264006d..4568236 100644
--- a/src/lib/WriterPlsParser.cxx
+++ b/src/lib/WriterPlsParser.cxx
@@ -1084,7 +1084,7 @@ bool WriterPlsParser::sendWindow(int zone, MWAWVec2i limits)
listener->insertBreak(MWAWTextListener::ColumnBreak);
}
}
- // fall through intended
+ FALLTHROUGH;
case 0:
case 2:
ok = readText(pInfo);
diff --git a/src/lib/ZWrtText.cxx b/src/lib/ZWrtText.cxx
index fce716d..ea26c05 100644
--- a/src/lib/ZWrtText.cxx
+++ b/src/lib/ZWrtText.cxx
@@ -791,6 +791,7 @@ bool ZWrtText::sendHeaderFooter(bool header)
break;
}
input->seek(actPos+1, librevenge::RVNG_SEEK_SET);
+ FALLTHROUGH;
default:
listener->insertCharacter(static_cast<unsigned char>(c), input, endPos);
break;
diff --git a/src/lib/libmwaw_internal.cxx b/src/lib/libmwaw_internal.cxx
index 6976def..f4d45f5 100644
--- a/src/lib/libmwaw_internal.cxx
+++ b/src/lib/libmwaw_internal.cxx
@@ -339,12 +339,14 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
switch (ch) {
case 'Y':
list.insert("number:style", "long");
+ FALLTHROUGH;
case 'y':
list.insert("librevenge:value-type", "year");
propVect.append(list);
break;
case 'B':
list.insert("number:style", "long");
+ FALLTHROUGH;
case 'b':
case 'h':
list.insert("librevenge:value-type", "month");
@@ -357,13 +359,14 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
break;
case 'e':
list.insert("number:style", "long");
- // fall-through intended
+ FALLTHROUGH;
case 'd':
list.insert("librevenge:value-type", "day");
propVect.append(list);
break;
case 'A':
list.insert("number:style", "long");
+ FALLTHROUGH;
case 'a':
list.insert("librevenge:value-type", "day-of-week");
propVect.append(list);
@@ -371,7 +374,7 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
case 'H':
list.insert("number:style", "long");
- // fall-through intended
+ FALLTHROUGH;
case 'I':
list.insert("librevenge:value-type", "hours");
propVect.append(list);
diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
index b63c4c8..317cbfa 100644
--- a/src/lib/libmwaw_internal.hxx
+++ b/src/lib/libmwaw_internal.hxx
@@ -116,6 +116,21 @@ struct MWAW_shared_ptr_noop_deleter {
# define LIBMWAW_ATTRIBUTE_PRINTF(fmt, arg)
#endif
+#if defined(__clang__)
+# if __has_cpp_attribute(clang::fallthrough)
+# define FALLTHROUGH [[clang::fallthrough]]
+# else
+# define FALLTHROUGH
+# endif
+#elif defined(__GNUC__)
+# if __GNUC__>=7
+# define FALLTHROUGH [[fallthrough]]
+# else
+# define FALLTHROUGH
+# endif
+#else
+# define FALLTHROUGH
+#endif
/* ---------- debug --------------- */
#ifdef DEBUG
namespace libmwaw
--
2.9.4

600
recipes-filter/libmwaw/files/0002-Rename-FALLTHROUGH-in-MWAW_FALLTHROUGH-simplify-code.patch Normal file
View File

@@ -0,0 +1,600 @@
From aa17a93b9af37825009490855df9ab4f83c43ec2 Mon Sep 17 00:00:00 2001
From: osnola <alonso@loria.fr>
Date: Mon, 3 Jul 2017 12:22:52 +0200
Subject: [PATCH 2/2] Rename FALLTHROUGH in MWAW_FALLTHROUGH + simplify code...
---
src/lib/BeagleWksDBParser.cxx | 2 +-
src/lib/ClarisDrawText.cxx | 4 ++--
src/lib/ClarisWksText.cxx | 4 ++--
src/lib/HanMacWrdKGraph.cxx | 2 +-
src/lib/HanMacWrdKParser.cxx | 2 +-
src/lib/MWAWChart.cxx | 2 +-
src/lib/MWAWGraphicListener.cxx | 4 ++--
src/lib/MWAWGraphicShape.cxx | 2 +-
src/lib/MWAWPageSpan.cxx | 2 +-
src/lib/MWAWPresentationListener.cxx | 4 ++--
src/lib/MWAWSpreadsheetListener.cxx | 8 ++++----
src/lib/MWAWTextListener.cxx | 10 +++++-----
src/lib/MacDraft5Parser.cxx | 2 +-
src/lib/MacDrawProParser.cxx | 4 ++--
src/lib/MacDrawProStyleManager.cxx | 4 ++--
src/lib/MarinerWrtGraph.cxx | 4 ++--
src/lib/MarinerWrtText.cxx | 2 +-
src/lib/MoreText.cxx | 2 +-
src/lib/MsWksDBParser.cxx | 2 +-
src/lib/MsWksGraph.cxx | 4 ++--
src/lib/MsWksSSParser.cxx | 2 +-
src/lib/PowerPoint3Parser.cxx | 2 +-
src/lib/RagTimeSpreadsheet.cxx | 8 ++++----
src/lib/WriterPlsParser.cxx | 2 +-
src/lib/ZWrtText.cxx | 2 +-
src/lib/libmwaw_internal.cxx | 10 +++++-----
src/lib/libmwaw_internal.hxx | 17 ++++++++---------
27 files changed, 56 insertions(+), 57 deletions(-)
diff --git a/src/lib/BeagleWksDBParser.cxx b/src/lib/BeagleWksDBParser.cxx
index efaf283..04f9b31 100644
--- a/src/lib/BeagleWksDBParser.cxx
+++ b/src/lib/BeagleWksDBParser.cxx
@@ -1009,7 +1009,7 @@ bool BeagleWksDBParser::readRow()
if (fSz>20) break;
val=static_cast<int>(input->readULong(2));
if (val) f << "g0=" << std::hex << val << std::dec << ",";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case BeagleWksDBParserInternal::Cell::Memo: // memoId
case BeagleWksDBParserInternal::Cell::Picture: // pictId
case BeagleWksDBParserInternal::Cell::Number:
diff --git a/src/lib/ClarisDrawText.cxx b/src/lib/ClarisDrawText.cxx
index f032414..80f9ee0 100644
--- a/src/lib/ClarisDrawText.cxx
+++ b/src/lib/ClarisDrawText.cxx
@@ -520,7 +520,7 @@ shared_ptr<ClarisWksStruct::DSET> ClarisDrawText::readDSETZone(ClarisWksStruct::
textZone->m_position = ClarisWksStruct::DSET::P_Main;
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("ClarisDrawText::readDSETZone: find unknown position %d\n", (textZone->m_textType >> 4)));
f << "#position="<< (textZone->m_textType >> 4) << ",";
@@ -1358,7 +1358,7 @@ bool ClarisDrawText::sendText(ClarisDrawTextInternal::DSET const &zone, int subZ
}
MWAW_DEBUG_MSG(("ClarisDrawText::sendText: Find unexpected char 1\n"));
f << "###";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0xb: // page break
MWAW_DEBUG_MSG(("ClarisDrawText::sendText: Find unexpected page break\n"));
f << "###pb";
diff --git a/src/lib/ClarisWksText.cxx b/src/lib/ClarisWksText.cxx
index 41bf87d..8a9e262 100644
--- a/src/lib/ClarisWksText.cxx
+++ b/src/lib/ClarisWksText.cxx
@@ -754,7 +754,7 @@ shared_ptr<ClarisWksStruct::DSET> ClarisWksText::readDSETZone(ClarisWksStruct::D
textZone->m_position = ClarisWksStruct::DSET::P_Main;
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("ClarisWksText::readDSETZone: find unknown position %d\n", (textZone->m_textType >> 4)));
f << "#position="<< (textZone->m_textType >> 4) << ",";
@@ -1788,7 +1788,7 @@ bool ClarisWksText::sendText(ClarisWksTextInternal::Zone const &zone, MWAWListen
}
MWAW_DEBUG_MSG(("ClarisWksText::sendText: Find unexpected char 1\n"));
f << "###";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0xb: // page break
numSectionInPage = 0;
if (main)
diff --git a/src/lib/HanMacWrdKGraph.cxx b/src/lib/HanMacWrdKGraph.cxx
index fe4a3e2..b9a4c56 100644
--- a/src/lib/HanMacWrdKGraph.cxx
+++ b/src/lib/HanMacWrdKGraph.cxx
@@ -1260,7 +1260,7 @@ bool HanMacWrdKGraph::sendFrame(HanMacWrdKGraphInternal::Frame const &frame, MWA
return true;
}
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 10:
return sendTextBox(static_cast<HanMacWrdKGraphInternal::TextBox const &>(frame), pos);
case 6: {
diff --git a/src/lib/HanMacWrdKParser.cxx b/src/lib/HanMacWrdKParser.cxx
index ef9bd88..0df5d4f 100644
--- a/src/lib/HanMacWrdKParser.cxx
+++ b/src/lib/HanMacWrdKParser.cxx
@@ -507,7 +507,7 @@ bool HanMacWrdKParser::readZone(shared_ptr<HanMacWrdKZone> zone)
case 0xc:
if (readZonec(zone))
return true;
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0xd:
if (m_graphParser->readPicture(zone))
return true;
diff --git a/src/lib/MWAWChart.cxx b/src/lib/MWAWChart.cxx
index c9b6e6d..67bd706 100644
--- a/src/lib/MWAWChart.cxx
+++ b/src/lib/MWAWChart.cxx
@@ -624,7 +624,7 @@ std::ostream &operator<<(std::ostream &o, MWAWChart::TextZone const &zone)
switch (zone.m_type) {
case MWAWChart::TextZone::T_SubTitle:
o << "sub";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWChart::TextZone::T_Title:
o << "title";
if (zone.m_contentType==MWAWChart::TextZone::C_Cell)
diff --git a/src/lib/MWAWGraphicListener.cxx b/src/lib/MWAWGraphicListener.cxx
index 6b723e8..50c7857 100644
--- a/src/lib/MWAWGraphicListener.cxx
+++ b/src/lib/MWAWGraphicListener.cxx
@@ -1480,7 +1480,7 @@ void MWAWGraphicListener::_handleFrameParameters(librevenge::RVNGPropertyList &l
switch (pos.m_yPos) {
case MWAWPosition::YFull:
list.insert("svg:height", double(h), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
list.insert("style:vertical-pos", "from-top");
@@ -1522,7 +1522,7 @@ void MWAWGraphicListener::_handleFrameParameters(librevenge::RVNGPropertyList &l
switch (pos.m_xPos) {
case MWAWPosition::XFull:
list.insert("svg:width", double(w), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
list.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWGraphicShape.cxx b/src/lib/MWAWGraphicShape.cxx
index f1e7418..375899a 100644
--- a/src/lib/MWAWGraphicShape.cxx
+++ b/src/lib/MWAWGraphicShape.cxx
@@ -596,7 +596,7 @@ std::vector<MWAWGraphicShape::PathData> MWAWGraphicShape::getPath(bool forTransf
switch (m_type) {
case Measure:
MWAW_DEBUG_MSG(("MWAWGraphicShape::getPath: called on a measure, transform it in line\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case Line:
case Polygon: {
size_t n=m_vertices.size();
diff --git a/src/lib/MWAWPageSpan.cxx b/src/lib/MWAWPageSpan.cxx
index b1064c4..7302e05 100644
--- a/src/lib/MWAWPageSpan.cxx
+++ b/src/lib/MWAWPageSpan.cxx
@@ -226,7 +226,7 @@ void MWAWPageSpan::setHeaderFooter(MWAWHeaderFooter const &hF)
switch (hF.m_occurrence) {
case MWAWHeaderFooter::NEVER:
removeHeaderFooter(type, MWAWHeaderFooter::ALL);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWHeaderFooter::ALL:
removeHeaderFooter(type, MWAWHeaderFooter::ODD);
removeHeaderFooter(type, MWAWHeaderFooter::EVEN);
diff --git a/src/lib/MWAWPresentationListener.cxx b/src/lib/MWAWPresentationListener.cxx
index 23542cd..cb0c699 100644
--- a/src/lib/MWAWPresentationListener.cxx
+++ b/src/lib/MWAWPresentationListener.cxx
@@ -1489,7 +1489,7 @@ void MWAWPresentationListener::_handleFrameParameters(librevenge::RVNGPropertyLi
switch (pos.m_yPos) {
case MWAWPosition::YFull:
list.insert("svg:height", double(h), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
list.insert("style:vertical-pos", "from-top");
@@ -1531,7 +1531,7 @@ void MWAWPresentationListener::_handleFrameParameters(librevenge::RVNGPropertyLi
switch (pos.m_xPos) {
case MWAWPosition::XFull:
list.insert("svg:width", double(w), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
list.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWSpreadsheetListener.cxx b/src/lib/MWAWSpreadsheetListener.cxx
index f454fb8..c441434 100644
--- a/src/lib/MWAWSpreadsheetListener.cxx
+++ b/src/lib/MWAWSpreadsheetListener.cxx
@@ -1054,7 +1054,7 @@ void MWAWSpreadsheetListener::insertShape
default:
#endif
MWAW_DEBUG_MSG(("MWAWSpreadsheetListener::insertShape: UNKNOWN position, insert as char position\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1171,7 +1171,7 @@ bool MWAWSpreadsheetListener::openFrame(MWAWPosition const &pos, MWAWGraphicStyl
break;
case MWAWPosition::Unknown:
MWAW_DEBUG_MSG(("MWAWSpreadsheetListener::openFrame: UNKNOWN position, insert as char position\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1346,7 +1346,7 @@ void MWAWSpreadsheetListener::_handleFrameParameters
switch (pos.m_yPos) {
case MWAWPosition::YFull:
propList.insert("svg:height", double(h), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
propList.insert("style:vertical-pos", "from-top");
@@ -1388,7 +1388,7 @@ void MWAWSpreadsheetListener::_handleFrameParameters
switch (pos.m_xPos) {
case MWAWPosition::XFull:
propList.insert("svg:width", double(w), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
propList.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MWAWTextListener.cxx b/src/lib/MWAWTextListener.cxx
index 151f64a..40606e6 100644
--- a/src/lib/MWAWTextListener.cxx
+++ b/src/lib/MWAWTextListener.cxx
@@ -1139,7 +1139,7 @@ void MWAWTextListener::insertShape
default:
#endif
MWAW_DEBUG_MSG(("MWAWTextListener::insertShape: UNKNOWN position, insert as char position\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1255,7 +1255,7 @@ bool MWAWTextListener::openFrame(MWAWPosition const &pos, MWAWGraphicStyle const
break;
case MWAWPosition::Unknown:
MWAW_DEBUG_MSG(("MWAWTextListener::openFrame: UNKNOWN position, insert as char position\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1339,7 +1339,7 @@ bool MWAWTextListener::openGroup(MWAWPosition const &pos)
default:
#endif
MWAW_DEBUG_MSG(("MWAWTextListener::openGroup: UNKNOWN position, insert as char position\n"));
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::CharBaseLine:
case MWAWPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1490,7 +1490,7 @@ void MWAWTextListener::_handleFrameParameters
switch (pos.m_yPos) {
case MWAWPosition::YFull:
propList.insert("svg:height", double(h), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::YTop:
if (origin[1] < 0 || origin[1] > 0) {
propList.insert("style:vertical-pos", "from-top");
@@ -1532,7 +1532,7 @@ void MWAWTextListener::_handleFrameParameters
switch (pos.m_xPos) {
case MWAWPosition::XFull:
propList.insert("svg:width", double(w), unit);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case MWAWPosition::XLeft:
if (origin[0] < 0 || origin[0] > 0) {
propList.insert("style:horizontal-pos", "from-left");
diff --git a/src/lib/MacDraft5Parser.cxx b/src/lib/MacDraft5Parser.cxx
index 6c11d41..e3ea4dd 100644
--- a/src/lib/MacDraft5Parser.cxx
+++ b/src/lib/MacDraft5Parser.cxx
@@ -1473,7 +1473,7 @@ bool MacDraft5Parser::readObject(MacDraft5ParserInternal::Layout &layout)
shape->m_shape=MWAWGraphicShape::rectangle(MWAWBox2f(listPts[0], listPts[2]), corner);
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0x3:
case 0x4: {
rotation=0;
diff --git a/src/lib/MacDrawProParser.cxx b/src/lib/MacDrawProParser.cxx
index 91c70fa..cf6e68d 100644
--- a/src/lib/MacDrawProParser.cxx
+++ b/src/lib/MacDrawProParser.cxx
@@ -1310,7 +1310,7 @@ int MacDrawProParser::readObject()
f << "bitmap,";
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
MWAW_DEBUG_MSG(("MacDrawProParser::readObject: find unknown type %d\n", val));
f << "###type=" << std::hex << val << std::dec << ",";
@@ -2230,7 +2230,7 @@ bool MacDrawProParser::readGeometryShapeData(MacDrawProParserInternal::Shape &sh
shape.m_shape.m_path.push_back(MWAWGraphicShape::PathData('L', listVertices.back()));
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 9: { // spline
if (remain<=2) {
MWAW_DEBUG_MSG(("MacDrawProParser::readGeometryShapeData: can not read compute the number of point in spline\n"));
diff --git a/src/lib/MacDrawProStyleManager.cxx b/src/lib/MacDrawProStyleManager.cxx
index 9fa242b..f670a57 100644
--- a/src/lib/MacDrawProStyleManager.cxx
+++ b/src/lib/MacDrawProStyleManager.cxx
@@ -2442,7 +2442,7 @@ bool MacDrawProStyleManager::readGradientMap(MWAWEntry const &entry, int N, int
break;
case 1:
gradient.m_type = MWAWGraphicStyle::G_Radial;
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2: {
if (type==2) gradient.m_type = MWAWGraphicStyle::G_Rectangular;
int dim[4]; // square which defined the center rectangle
@@ -2554,7 +2554,7 @@ bool MacDrawProStyleManager::readGradientPalette(MWAWEntry const &entry, int fie
break;
case 1:
f << "concentric,";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2: {
if (type==2) f << "radial,";
int dim[4]; // square which defined the center rectangle
diff --git a/src/lib/MarinerWrtGraph.cxx b/src/lib/MarinerWrtGraph.cxx
index fc9ecd0..ce26ac7 100644
--- a/src/lib/MarinerWrtGraph.cxx
+++ b/src/lib/MarinerWrtGraph.cxx
@@ -130,7 +130,7 @@ struct Token {
switch (m_pictBorderType[i]) {
case 1: // single[w=0.5]
border.m_width = 0.5;
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2:
border.m_style = MWAWBorder::Simple;
break;
@@ -1024,7 +1024,7 @@ bool MarinerWrtGraph::readTokenBlock0(MarinerWrtStruct const &data, MarinerWrtGr
case 0x18:
val = input->readLong(2);
if (val) f << "f0=" << val << ","; // fieldType?
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0x19:
case 0x1e:
case 0x1f:
diff --git a/src/lib/MarinerWrtText.cxx b/src/lib/MarinerWrtText.cxx
index 6d2e097..987fed7 100644
--- a/src/lib/MarinerWrtText.cxx
+++ b/src/lib/MarinerWrtText.cxx
@@ -235,7 +235,7 @@ MWAWBorder Paragraph::BorderFill::getBorder(int i) const
break;
case 1: // single[w=0.5]
res.m_width = 0.5;
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2:
res.m_style = MWAWBorder::Simple;
break;
diff --git a/src/lib/MoreText.cxx b/src/lib/MoreText.cxx
index c70fc77..bf61ee0 100644
--- a/src/lib/MoreText.cxx
+++ b/src/lib/MoreText.cxx
@@ -2050,7 +2050,7 @@ bool MoreText::readTabs(MWAWEntry const &entry, MoreTextInternal::Paragraph &par
break;
case 3: // more large space
f2 << "dot[large],";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2:
tab.m_leaderCharacter = '.';
break;
diff --git a/src/lib/MsWksDBParser.cxx b/src/lib/MsWksDBParser.cxx
index 1e67458..1ff5fd6 100644
--- a/src/lib/MsWksDBParser.cxx
+++ b/src/lib/MsWksDBParser.cxx
@@ -1143,7 +1143,7 @@ bool MsWksDBParser::readFormTypes(MsWksDBParserInternal::Form &form)
visible = MsWksDBParserInternal::V_HEADER;
break;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
f << "##unkn[visible]=" << hiFlag << ",";
break;
diff --git a/src/lib/MsWksGraph.cxx b/src/lib/MsWksGraph.cxx
index bb70d52..76b99df 100644
--- a/src/lib/MsWksGraph.cxx
+++ b/src/lib/MsWksGraph.cxx
@@ -1227,7 +1227,7 @@ bool MsWksGraph::readPictHeader(MsWksGraphInternal::Zone &pict)
switch (lineFlags&3) {
case 2:
style.m_arrows[0]=MWAWGraphicStyle::Arrow::plain();
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 1:
style.m_arrows[1]=MWAWGraphicStyle::Arrow::plain();
break;
@@ -1989,7 +1989,7 @@ bool MsWksGraph::readRB(MWAWInputStreamPtr input, MWAWEntry const &entry, int ki
case 2:
if (input->readLong(1)!=3) return false;
f << "id=" << input->readLong(1) << ",";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 1: {
unsigned long dSz=input->readULong(4);
beginRB=input->tell();
diff --git a/src/lib/MsWksSSParser.cxx b/src/lib/MsWksSSParser.cxx
index 271a5c7..d9aba6f 100644
--- a/src/lib/MsWksSSParser.cxx
+++ b/src/lib/MsWksSSParser.cxx
@@ -933,7 +933,7 @@ bool MsWksSSParser::readCell(int sz, MWAWVec2i const &cellPos, MsWksSSParserInte
break;
case 3:
f << "type" << type << ",";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 2: //number general
format.m_format=MWAWCell::F_NUMBER;
content.m_contentType=MWAWCellContent::C_FORMULA;
diff --git a/src/lib/PowerPoint3Parser.cxx b/src/lib/PowerPoint3Parser.cxx
index 81b15f2..6bdfe49 100644
--- a/src/lib/PowerPoint3Parser.cxx
+++ b/src/lib/PowerPoint3Parser.cxx
@@ -2952,7 +2952,7 @@ bool PowerPoint3Parser::readParagraph(MWAWParagraph &para, PowerPoint3ParserInte
}
val &= 0xbf;
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
if (val)
f << std::hex << val << std::dec << ",";
diff --git a/src/lib/RagTimeSpreadsheet.cxx b/src/lib/RagTimeSpreadsheet.cxx
index 2f22f2b..4210358 100644
--- a/src/lib/RagTimeSpreadsheet.cxx
+++ b/src/lib/RagTimeSpreadsheet.cxx
@@ -1415,9 +1415,9 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
break;
case 0x81:
f << "float81,";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 3:
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 1: {
if (type==3) {
format.m_format=MWAWCell::F_DATE; // we need the format to choose between date and time
@@ -1444,7 +1444,7 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
}
case 0x24:
f << "text2,";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 4: {
format.m_format=MWAWCell::F_TEXT;
content.m_textEntry.setBegin(input->tell());
@@ -1483,7 +1483,7 @@ bool RagTimeSpreadsheet::readSpreadsheetCellContent(RagTimeSpreadsheetInternal::
}
case 0x51:
f << "long51,";
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0x11: // or 2 int?
if (pos+5>endPos) {
ok=false;
diff --git a/src/lib/WriterPlsParser.cxx b/src/lib/WriterPlsParser.cxx
index 4568236..4207223 100644
--- a/src/lib/WriterPlsParser.cxx
+++ b/src/lib/WriterPlsParser.cxx
@@ -1084,7 +1084,7 @@ bool WriterPlsParser::sendWindow(int zone, MWAWVec2i limits)
listener->insertBreak(MWAWTextListener::ColumnBreak);
}
}
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 0:
case 2:
ok = readText(pInfo);
diff --git a/src/lib/ZWrtText.cxx b/src/lib/ZWrtText.cxx
index ea26c05..5d910da 100644
--- a/src/lib/ZWrtText.cxx
+++ b/src/lib/ZWrtText.cxx
@@ -791,7 +791,7 @@ bool ZWrtText::sendHeaderFooter(bool header)
break;
}
input->seek(actPos+1, librevenge::RVNG_SEEK_SET);
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
default:
listener->insertCharacter(static_cast<unsigned char>(c), input, endPos);
break;
diff --git a/src/lib/libmwaw_internal.cxx b/src/lib/libmwaw_internal.cxx
index f4d45f5..2a879e3 100644
--- a/src/lib/libmwaw_internal.cxx
+++ b/src/lib/libmwaw_internal.cxx
@@ -339,14 +339,14 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
switch (ch) {
case 'Y':
list.insert("number:style", "long");
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 'y':
list.insert("librevenge:value-type", "year");
propVect.append(list);
break;
case 'B':
list.insert("number:style", "long");
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 'b':
case 'h':
list.insert("librevenge:value-type", "month");
@@ -359,14 +359,14 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
break;
case 'e':
list.insert("number:style", "long");
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 'd':
list.insert("librevenge:value-type", "day");
propVect.append(list);
break;
case 'A':
list.insert("number:style", "long");
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 'a':
list.insert("librevenge:value-type", "day-of-week");
propVect.append(list);
@@ -374,7 +374,7 @@ bool convertDTFormat(std::string const &dtFormat, librevenge::RVNGPropertyListVe
case 'H':
list.insert("number:style", "long");
- FALLTHROUGH;
+ MWAW_FALLTHROUGH;
case 'I':
list.insert("librevenge:value-type", "hours");
propVect.append(list);
diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
index 317cbfa..4c9580d 100644
--- a/src/lib/libmwaw_internal.hxx
+++ b/src/lib/libmwaw_internal.hxx
@@ -116,21 +116,20 @@ struct MWAW_shared_ptr_noop_deleter {
# define LIBMWAW_ATTRIBUTE_PRINTF(fmt, arg)
#endif
+/** fall through attributes */
+#define MWAW_FALLTHROUGH
#if defined(__clang__)
-# if __has_cpp_attribute(clang::fallthrough)
-# define FALLTHROUGH [[clang::fallthrough]]
-# else
-# define FALLTHROUGH
+# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
+# undef MWAW_FALLTHROUGH
+# define MWAW_FALLTHROUGH [[clang::fallthrough]]
# endif
#elif defined(__GNUC__)
# if __GNUC__>=7
-# define FALLTHROUGH [[fallthrough]]
-# else
-# define FALLTHROUGH
+# undef MWAW_FALLTHROUGH
+# define MWAW_FALLTHROUGH __attribute__ ((fallthrough))
# endif
-#else
-# define FALLTHROUGH
#endif
+
/* ---------- debug --------------- */
#ifdef DEBUG
namespace libmwaw
--
2.9.4

19
recipes-filter/libmwaw/libmwaw_0.3.11.bb Normal file
View File

@@ -0,0 +1,19 @@
SUMMARY = "A library for import of many old Mac document formats"
HOMEPAGE = "http://sourceforge.net/projects/libmwaw"
LICENSE = " LGPLv2.1 & MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.LGPL;md5=a049c5e22d3bd7bc3c9a2e9135a6d104 \
file://COPYING.MPL;md5=cce0d89a18de69e7f51f693182ac4a3e \
"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2 \
file://0001-gcc7-try-to-correct-some-warnings.patch \
file://0002-Rename-FALLTHROUGH-in-MWAW_FALLTHROUGH-simplify-code.patch \
"
SRC_URI[md5sum] = "d986a3405788666c4e716f130666499f"
SRC_URI[sha256sum] = "61f5435ebe5e16581d297e8e29b4c9d24d3a1a8a41d497b9fed2452146050150"
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"

14
recipes-filter/libmwaw/libmwaw_0.3.21.bb
View File

@@ -1,14 +0,0 @@
SUMMARY = "A library for import of many old Mac document formats"
HOMEPAGE = "http://sourceforge.net/projects/libmwaw"
LICENSE = " LGPL-2.1-only & MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.LGPL;md5=a049c5e22d3bd7bc3c9a2e9135a6d104 \
file://COPYING.MPL;md5=cce0d89a18de69e7f51f693182ac4a3e \
"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.bz2"
SRC_URI[sha256sum] = "a227a454b894804683e6ce9c0880ffcdafc7fe9f4b54db2d056a5cc3dfc23634"
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"

6
recipes-filter/libodfgen/libodfgen_0.1.7.bb → recipes-filter/libodfgen/libodfgen_0.1.6.bb
View File

@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = "https://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "ec7ce6c69aac83f8a9e6280d919b3cad"
SRC_URI[sha256sum] = "323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/libwpd/${BPN}/${BPN}-${PV}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "731fd5e5513c55ed64458a0a8c33a830"
SRC_URI[sha256sum] = "03b210ab44f05e38091508cdca6ba0ff73de3ea8a168f849b8f1c5059c20b9e9"
inherit autotools pkgconfig perlnative

43
recipes-filter/libpagemaker/files/0001-Workaround-build-error-with-gcc8.patch
View File

@@ -1,43 +0,0 @@
From e3f451d4340acef6872126eec84ec557ed9d21bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 2 Jul 2018 15:59:24 +0200
Subject: [PATCH] Workaround build error with gcc8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/lib/PMDParser.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/lib/PMDParser.cpp b/src/lib/PMDParser.cpp
index 481f6bf..50c3033 100644
--- a/src/lib/PMDParser.cpp
+++ b/src/lib/PMDParser.cpp
@@ -846,6 +846,10 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength)
{
throw PMDParseException("Endianness marker is corrupt in PMD header.");
}
+#if __GNUC__ > 7
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcatch-value"
+#endif
try
{
seek(m_input, TABLE_OF_CONTENTS_LENGTH_OFFSET);
@@ -866,6 +868,9 @@ void PMDParser::parseHeader(uint32_t *tocOffset, uint16_t *tocLength)
{
throw PMDParseException("Can't find the table of contents offset in the header.");
}
+#if __GNUC__ > 7
+#pragma GCC diagnostic pop
+#endif
}
void PMDParser::readNextRecordFromTableOfContents(ToCState &state, const bool subRecord, const uint16_t subRecordType)
--
2.14.4

11
recipes-filter/libpagemaker/libpagemaker_0.0.4.bb → recipes-filter/libpagemaker/libpagemaker_0.0.3.bb
View File

@@ -4,13 +4,12 @@ LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-Workaround-build-error-with-gcc8.patch \
"
SRC_URI[md5sum] = "8395dfc5eef11c58d5a9efe3bfe64831"
SRC_URI[sha256sum] = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "9f377b0690fa6e96a94bb309509860e9"
SRC_URI[sha256sum] = "d896dc55dafd84ee3441e0ca497b810809f9eea44805a495c3843412309036d6"
inherit autotools pkgconfig
DEPENDS = "icu librevenge"
BBCLASSEXTEND = "native"

6
recipes-filter/libvisio/libvisio_0.1.7.bb → recipes-filter/libvisio/libvisio_0.1.6.bb
View File

@@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "812a21fee1f7b096612ca83fdafb0db7"
SRC_URI[sha256sum] = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c"
SRC_URI[md5sum] = "b60b7f4233105261eb139d82cbf3b33a"
SRC_URI[sha256sum] = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"
inherit autotools pkgconfig
DEPENDS = "icu libxml2 librevenge"
BBCLASSEXTEND = "native"

47
recipes-filter/libwpd/libwpd/0001-Add-include-cstddef-to-fix-build-with-gcc11.patch
View File

@@ -1,47 +0,0 @@
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

14
recipes-filter/libwpd/libwpd_0.10.1.bb Normal file
View File

@@ -0,0 +1,14 @@
SUMMARY = "Library for importing WordPerfect (tm) documents"
HOMEPAGE = "http://libwpd.sourceforge.net/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "79b56bcc349264d686a67994506ad199"
SRC_URI[sha256sum] = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"
inherit autotools pkgconfig perlnative
DEPENDS = "librevenge"

17
recipes-filter/libwpd/libwpd_0.10.3.bb
View File

@@ -1,17 +0,0 @@
SUMMARY = "Library for importing WordPerfect (tm) documents"
HOMEPAGE = "http://libwpd.sourceforge.net/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
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"
inherit autotools pkgconfig perlnative
DEPENDS = "librevenge"

8
recipes-filter/libwpg/libwpg_0.3.3.bb → recipes-filter/libwpg/libwpg_0.3.1.bb
View File

@@ -5,11 +5,11 @@ LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "c3727b1196506fc77f6f916866884411"
SRC_URI[sha256sum] = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.bz2"
SRC_URI[md5sum] = "dfd066658ec9d2fb2262417039a8a1c3"
SRC_URI[sha256sum] = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"
inherit autotools pkgconfig
DEPENDS = "librevenge libwpd zlib"
RDEPENDS:${PN} = "perl"
RDEPENDS_${PN} = "perl"

319
recipes-filter/libwps/files/0001-g-7-try-to-remove-some-warnings.patch Normal file
View File

@@ -0,0 +1,319 @@
From e1b2c2f34268d14aa469c88ab89bd9f491168bd0 Mon Sep 17 00:00:00 2001
From: osnola <alonso@loria.fr>
Date: Mon, 3 Jul 2017 10:04:00 +0200
Subject: [PATCH] g++7: try to remove some warnings...
Upstream-Status: Submitted [1]
[1] https://sourceforge.net/p/libwps/code/ci/master/tree/
---
src/lib/WKS4Spreadsheet.cpp | 2 +-
src/lib/WKSContentListener.cpp | 4 ++--
src/lib/WPS4.cpp | 2 +-
src/lib/WPS4Text.cpp | 7 ++++---
src/lib/WPS8Table.cpp | 2 +-
src/lib/WPS8TextStyle.cpp | 4 +++-
src/lib/WPSCell.cpp | 11 +++++++----
src/lib/WPSContentListener.cpp | 6 +++---
src/lib/WPSGraphicShape.cpp | 1 +
src/lib/WPSPageSpan.cpp | 1 +
src/lib/libwps_internal.cpp | 1 +
src/lib/libwps_internal.h | 14 ++++++++++++++
src/lib/libwps_tools_win.cpp | 1 +
13 files changed, 40 insertions(+), 16 deletions(-)
diff --git a/src/lib/WKS4Spreadsheet.cpp b/src/lib/WKS4Spreadsheet.cpp
index 29dd98e..cf3232c 100644
--- a/src/lib/WKS4Spreadsheet.cpp
+++ b/src/lib/WKS4Spreadsheet.cpp
@@ -821,7 +821,7 @@ bool WKS4Spreadsheet::readMsWorksStyle()
break;
case 5: // center arround cell
f << ",center[between cell]";
- // fail through expected
+ WPS_FALLTHROUGH;
case 2:
style.setHAlignement(WPSCell::HALIGN_CENTER);
break;
diff --git a/src/lib/WKSContentListener.cpp b/src/lib/WKSContentListener.cpp
index 08d8209..d24b8a2 100644
--- a/src/lib/WKSContentListener.cpp
+++ b/src/lib/WKSContentListener.cpp
@@ -775,7 +775,7 @@ void WKSContentListener::_handleFrameParameters
{
case WPSPosition::YFull:
propList.insert("svg:height", double(h), unit);
- // fall-through intended
+ WPS_FALLTHROUGH;
case WPSPosition::YTop:
if (origin[1] < 0.0 || origin[1] > 0.0)
{
@@ -819,7 +819,7 @@ void WKSContentListener::_handleFrameParameters
{
case WPSPosition::XFull:
propList.insert("svg:width", double(w), unit);
- // fallthrough intended
+ WPS_FALLTHROUGH;
case WPSPosition::XLeft:
if (origin[0] < 0.0 || origin[0] > 0.0)
{
diff --git a/src/lib/WPS4.cpp b/src/lib/WPS4.cpp
index cc6493d..2629086 100644
--- a/src/lib/WPS4.cpp
+++ b/src/lib/WPS4.cpp
@@ -585,7 +585,7 @@ bool WPS4Parser::findZones()
{
case 0xda1:
apCreator = 2;
- // fall-through intended
+ WPS_FALLTHROUGH;
case 0:
case 1:
worksVersion = 1;
diff --git a/src/lib/WPS4Text.cpp b/src/lib/WPS4Text.cpp
index 76f0e5f..fe464ce 100644
--- a/src/lib/WPS4Text.cpp
+++ b/src/lib/WPS4Text.cpp
@@ -910,6 +910,7 @@ bool WPS4Text::readText(WPSEntry const &zone)
}
m_input->seek(-1, librevenge::RVNG_SEEK_CUR);
}
+ WPS_FALLTHROUGH;
default:
if (version()<=2)
{
@@ -1593,7 +1594,7 @@ bool WPS4Text::readDosLink(WPSEntry const &entry)
val = libwps::readU16(m_input); // always 4
if (val != 4) f << "g1=" << val << ",";
}
- // fall-through intended
+ WPS_FALLTHROUGH;
case 0x40: // spreadsheet range
case 0x01: // char ?
{
@@ -1999,7 +2000,7 @@ bool WPS4Text::readParagraph(long endPos, int &id, std::string &mess)
break;
case 0x13: // seems another way to define the left margin
f << "#left,";
- // fall-through intended
+ WPS_FALLTHROUGH;
case 0x12:
pp.m_margins[1] = arg/1440.;
break;
@@ -2565,7 +2566,7 @@ bool WPS4Text::readPLC
break;
default:
WPS_DEBUG_MSG(("WPS4Text:readPLC: unexpected PLC size\n"));
- // fallthrough intended
+ WPS_FALLTHROUGH;
case 0:
plc.m_value = 0;
}
diff --git a/src/lib/WPS8Table.cpp b/src/lib/WPS8Table.cpp
index 3280158..da6bfa9 100644
--- a/src/lib/WPS8Table.cpp
+++ b/src/lib/WPS8Table.cpp
@@ -605,7 +605,7 @@ bool WPS8Table::readMCLD(RVNGInputStreamPtr input, WPSEntry const &entry)
break; // normal
case 0xFF: // also unset, diff with value = 1 ?
f2 << "#f" << dt.id() << "=" << std::hex << dt.m_value << std::dec << ",";
- // fall-through intended
+ WPS_FALLTHROUGH;
case 1:
cell->setVerticalSet(false);
break;
diff --git a/src/lib/WPS8TextStyle.cpp b/src/lib/WPS8TextStyle.cpp
index aa02e49..dbaeb71 100644
--- a/src/lib/WPS8TextStyle.cpp
+++ b/src/lib/WPS8TextStyle.cpp
@@ -671,6 +671,7 @@ bool WPS8TextStyle::readParagraph(long endPos, int &id, std::string &mess)
{
case 2: // not frequent: only found one time
f << "#type[bullet]=2,";
+ WPS_FALLTHROUGH;
case 1: // the normal case
para.m_listLevelIndex = 1;
para.m_listLevel.m_type = libwps::BULLET;
@@ -756,7 +757,7 @@ bool WPS8TextStyle::readParagraph(long endPos, int &id, std::string &mess)
break;
default:
f << "#bullet/type=" << type << ",";
- // fall-through intended
+ WPS_FALLTHROUGH;
case 2:
para.m_listLevel.m_type = libwps::ARABIC;
break;
@@ -1001,6 +1002,7 @@ bool WPS8TextStyle::readParagraph(long endPos, int &id, std::string &mess)
f << "extra[tabs]=[" << data.m_recursData[ch] << "],";
}
}
+ WPS_FALLTHROUGH; // checkme
case 0x34: // interline line spacing 8*152400 -> normal, sinon *2
{
diff --git a/src/lib/WPSCell.cpp b/src/lib/WPSCell.cpp
index 7086140..d87ea0b 100644
--- a/src/lib/WPSCell.cpp
+++ b/src/lib/WPSCell.cpp
@@ -64,12 +64,14 @@ bool WPSCellFormat::convertDTFormat(std::string const &dtFormat, librevenge::RVN
{
case 'Y':
list.insert("number:style", "long");
+ WPS_FALLTHROUGH;
case 'y':
list.insert("librevenge:value-type", "year");
propVect.append(list);
break;
case 'B':
list.insert("number:style", "long");
+ WPS_FALLTHROUGH;
case 'b':
case 'h':
list.insert("librevenge:value-type", "month");
@@ -82,13 +84,14 @@ bool WPSCellFormat::convertDTFormat(std::string const &dtFormat, librevenge::RVN
break;
case 'e':
list.insert("number:style", "long");
- // fall-through intended
+ WPS_FALLTHROUGH;
case 'd':
list.insert("librevenge:value-type", "day");
propVect.append(list);
break;
case 'A':
list.insert("number:style", "long");
+ WPS_FALLTHROUGH;
case 'a':
list.insert("librevenge:value-type", "day-of-week");
propVect.append(list);
@@ -96,7 +99,7 @@ bool WPSCellFormat::convertDTFormat(std::string const &dtFormat, librevenge::RVN
case 'H':
list.insert("number:style", "long");
- // fall-through intended
+ WPS_FALLTHROUGH;
case 'I':
list.insert("librevenge:value-type", "hours");
propVect.append(list);
@@ -286,11 +289,11 @@ bool WPSCellFormat::getNumberingProperties(librevenge::RVNGPropertyList &propLis
{
case 5: // thousand
propList.insert("number:grouping", true);
- // fall-through intended
+ WPS_FALLTHROUGH;
case 0: // default
if (m_subFormat==0)
propList.remove("number:decimal-places");
- // fall-through intended
+ WPS_FALLTHROUGH;
case 1: // decimal
propList.insert("librevenge:value-type", "number");
break;
diff --git a/src/lib/WPSContentListener.cpp b/src/lib/WPSContentListener.cpp
index 9d5e390..5994e51 100644
--- a/src/lib/WPSContentListener.cpp
+++ b/src/lib/WPSContentListener.cpp
@@ -1183,7 +1183,7 @@ bool WPSContentListener::openGroup(WPSPosition const &pos)
default:
WPS_DEBUG_MSG(("WPSContentListener::openGroup: UNKNOWN position, insert as char position\n"));
#endif
- // fallthrough intended
+ WPS_FALLTHROUGH;
case WPSPosition::CharBaseLine:
case WPSPosition::Char:
if (m_ps->m_isSpanOpened)
@@ -1372,7 +1372,7 @@ void WPSContentListener::_handleFrameParameters
{
case WPSPosition::YFull:
propList.insert("svg:height", double(h), unit);
- // fall-through intended
+ WPS_FALLTHROUGH;
case WPSPosition::YTop:
if (origin[1] < 0.0 || origin[1] > 0.0)
{
@@ -1416,7 +1416,7 @@ void WPSContentListener::_handleFrameParameters
{
case WPSPosition::XFull:
propList.insert("svg:width", double(w), unit);
- // fallthrough intended
+ WPS_FALLTHROUGH;
case WPSPosition::XLeft:
if (origin[0] < 0.0 || origin[0] > 0.0)
{
diff --git a/src/lib/WPSGraphicShape.cpp b/src/lib/WPSGraphicShape.cpp
index 6a73f8b..6c60213 100644
--- a/src/lib/WPSGraphicShape.cpp
+++ b/src/lib/WPSGraphicShape.cpp
@@ -631,6 +631,7 @@ std::vector<WPSGraphicShape::PathData> WPSGraphicShape::getPath(bool forTransfor
break;
}
}
+ WPS_FALLTHROUGH;
case Arc:
case Pie:
{
diff --git a/src/lib/WPSPageSpan.cpp b/src/lib/WPSPageSpan.cpp
index f4d2fca..0444680 100644
--- a/src/lib/WPSPageSpan.cpp
+++ b/src/lib/WPSPageSpan.cpp
@@ -114,6 +114,7 @@ void WPSPageSpan::setHeaderFooter(const HeaderFooterType type, const HeaderFoote
{
case NEVER:
_removeHeaderFooter(type, ALL);
+ WPS_FALLTHROUGH;
case FIRST:
case ALL:
_removeHeaderFooter(type, ODD);
diff --git a/src/lib/libwps_internal.cpp b/src/lib/libwps_internal.cpp
index 73d1999..0be82b4 100644
--- a/src/lib/libwps_internal.cpp
+++ b/src/lib/libwps_internal.cpp
@@ -488,6 +488,7 @@ librevenge::RVNGString WPSField::getString() const
struct tm timeinfo;
if (localtime_r(&now, &timeinfo))
{
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
char buf[256];
strftime(buf, 256, format.c_str(), &timeinfo);
res=librevenge::RVNGString(buf);
diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
index 690dedb..8e91806 100644
--- a/src/lib/libwps_internal.h
+++ b/src/lib/libwps_internal.h
@@ -83,6 +83,20 @@ struct WPS_shared_ptr_noop_deleter
void operator()(T *) {}
};
+/** fall through attributes */
+#define WPS_FALLTHROUGH
+#if defined(__clang__)
+# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
+# undef WPS_FALLTHROUGH
+# define WPS_FALLTHROUGH [[clang::fallthrough]]
+# endif
+#elif defined(__GNUC__)
+# if __GNUC__>=7
+# undef WPS_FALLTHROUGH
+# define WPS_FALLTHROUGH __attribute__ ((fallthrough))
+# endif
+#endif
+
// basic classes and autoptr
/** shared pointer to librevenge::RVNGInputStream */
typedef shared_ptr<librevenge::RVNGInputStream> RVNGInputStreamPtr;
diff --git a/src/lib/libwps_tools_win.cpp b/src/lib/libwps_tools_win.cpp
index 80f53c7..2868267 100644
--- a/src/lib/libwps_tools_win.cpp
+++ b/src/lib/libwps_tools_win.cpp
@@ -186,6 +186,7 @@ Font::Type Font::getTypeForOEM(int oem)
default:
WPS_DEBUG_MSG(("libwps_tools_win::Font::getTypeForOEM: find unknown oem %d\n", oem));
+ WPS_FALLTHROUGH;
case 0:
return UNKNOWN;
}
--
2.9.4

17
recipes-filter/libwps/libwps_0.4.6.bb Normal file
View File

@@ -0,0 +1,17 @@
SUMMARY = "Import filter library for MS Works"
HOMEPAGE = "https://sourceforge.net/projects/libwps/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = " \
http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz \
file://0001-g-7-try-to-remove-some-warnings.patch \
"
SRC_URI[md5sum] = "b04428f208e2eb31adcba5a53dec62c2"
SRC_URI[sha256sum] = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"

14
recipes-filter/libwps/libwps_0.4.9.bb
View File

@@ -1,14 +0,0 @@
SUMMARY = "Import filter library for MS Works"
HOMEPAGE = "https://sourceforge.net/projects/libwps/"
LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=815ca599c9df247a0c7f619bab123dad \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "b49670696446f4e11cafa49ec566d54c"
SRC_URI[sha256sum] = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6db74922"
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"

36
recipes-graphics/inkscape/inkscape.bb
View File

@@ -1,36 +0,0 @@
SUMMARY = "Inkscape is a Free and open source vector graphics editor"
HOMEPAGE = "https://inkscape.org/"
LICENSE = "GPL-3.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=46f815712c095f667139ef42f2270d57"
SRC_URI = "gitsm://gitlab.com/inkscape/inkscape.git;protocol=https;nobranch=1"
SRCREV = "b0a8486541ac36327488da641d58a86bee2f07ad"
S = "${WORKDIR}/git"
PV = "1.2.2"
DEPENDS = " \
bdwgc \
cairo \
glib-2.0-native \
gsl \
gspell \
gtkmm3 \
harfbuzz \
lcms \
libsoup-2.4 \
libxslt \
pango \
poppler \
\
double-conversion \
lib2geom \
libcdr \
librevenge \
libvisio \
libwpg \
potrace \
"
inherit cmake pkgconfig gettext gtk-icon-cache bash-completion mime-xdg
FILES:${PN} += "${datadir}/metainfo"

77
recipes-graphics/inkscape/inkscape/0001-Fix-build-with-poppler-22.09.patch
View File

@@ -1,77 +0,0 @@
From ceb354d22bf25e4b48d00817cc993926358f258b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 15 Oct 2022 21:38:30 +0200
Subject: [PATCH] Fix build with poppler 22.09
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Statu: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/extension/internal/pdfinput/pdf-parser.cpp | 12 ++++++++++++
src/extension/internal/pdfinput/svg-builder.cpp | 10 ++++++++++
2 files changed, 22 insertions(+)
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index d6e2ede..b1ae5bb 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -685,6 +685,17 @@ void PdfParser::opConcat(Object args[], int /*numArgs*/)
// TODO not good that numArgs is ignored but args[] is used:
void PdfParser::opSetDash(Object args[], int /*numArgs*/)
{
+#if POPPLER_CHECK_VERSION(22,9,0)
+ Array *a = args[0].getArray();
+ int length = a->getLength();
+ std::vector<double> dash(length);
+ for (int i = 0; i < length; ++i) {
+ Object obj;
+ dash[i] = _POPPLER_CALL_ARGS_DEREF(obj, a->get, i).getNum();
+ _POPPLER_FREE(obj);
+ }
+ state->setLineDash(std::move(dash), args[1].getNum());
+#else
double *dash = nullptr;
Array *a = args[0].getArray();
@@ -698,6 +709,7 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
}
}
state->setLineDash(dash, length, args[1].getNum());
+#endif
builder->updateStyle(state);
}
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 901cc8c..ef660eb 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -388,6 +388,15 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
// Line dash
+#if POPPLER_CHECK_VERSION(22,9,0)
+ double dash_start;
+ const auto& dash_pattern = state->getLineDash(&dash_start);
+ int dash_length = dash_pattern.size();
+ if ( dash_length > 0 ) {
+ Inkscape::CSSOStringStream os_array;
+ for ( int i = 0 ; i < dash_pattern.size() ; i++ ) {
+ os_array << dash_pattern[i];
+#else
double *dash_pattern;
int dash_length;
double dash_start;
@@ -396,6 +405,7 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
Inkscape::CSSOStringStream os_array;
for ( int i = 0 ; i < dash_length ; i++ ) {
os_array << dash_pattern[i];
+#endif
if (i < (dash_length - 1)) {
os_array << ",";
}
--
2.35.3

24
recipes-graphics/inkscape/lib2geom_git.bb
View File

@@ -1,24 +0,0 @@
SUMMARY = "2Geom: easy 2D graphics library"
HOMEPAGE = "https://gitlab.com/inkscape/lib2geom"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING-LGPL-2.1;md5=fad9b3332be894bab9bc501572864b29"
inherit cmake pkgconfig
DEPENDS = "boost double-conversion gtk+3 glib-2.0 cairo gsl"
SRC_URI = " \
git://gitlab.com/inkscape/lib2geom.git;protocol=https;nobranch=1 \
"
PV = "1.2.2"
SRCREV = "a84a73ebdae50cc729f57d1ffb788aeaef0f746c"
S = "${WORKDIR}/git"
EXTRA_OECMAKE = " \
-D2GEOM_TESTING=FALSE \
-D2GEOM_STANDALONE=TRUE \
-D2GEOM_BUILD_SHARED=TRUE \
-D2GEOM_USE_GPL_CODE=TRUE \
"

132
recipes-graphics/scribus/scribus/0001-Build-break-with-poppler-22.2.0.patch
View File

@@ -1,132 +0,0 @@
From 85c0dff3422fa3c26fbc2e8d8561f597ec24bd92 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Wed, 2 Feb 2022 23:12:52 +0000
Subject: [PATCH] #16734: Build break with poppler 22.2.0
git-svn-id: svn://scribus.net/trunk/Scribus@24884 11d20701-8431-0410-a711-e3c959e3b870
Upstream-Status: Accepted
---
scribus/plugins/import/pdf/slaoutput.cpp | 47 +++++++++++++++++++-----
1 file changed, 37 insertions(+), 10 deletions(-)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 5894bf2ad6..3650c96f52 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -7,6 +7,11 @@ for which a new license (GPL+exception) is in place.
#include "slaoutput.h"
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+#include <memory>
+#include <optional>
+#endif
+
#include <poppler/GlobalParams.h>
#include <poppler/poppler-config.h>
#include <poppler/FileSpec.h>
@@ -3027,18 +3032,24 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
void SlaOutputDev::updateFont(GfxState *state)
{
GfxFont *gfxFont;
- GfxFontLoc *fontLoc;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ std::optional<GfxFontLoc> fontLoc;
+ const GooString * fileName = nullptr;
+ std::unique_ptr<FoFiTrueType> ff;
+#else
+ GfxFontLoc * fontLoc = nullptr;
+ GooString * fileName = nullptr;
+ FoFiTrueType * ff = nullptr;
+#endif
GfxFontType fontType;
SlaOutFontFileID *id;
SplashFontFile *fontFile;
SplashFontSrc *fontsrc = nullptr;
- FoFiTrueType *ff;
Object refObj, strObj;
- GooString *fileName;
- char *tmpBuf;
+ char *tmpBuf = nullptr;
int tmpBufLen = 0;
- int *codeToGID;
- const double *textMat;
+ int *codeToGID = nullptr;
+ const double *textMat = nullptr;
double m11, m12, m21, m22, fontSize;
SplashCoord mat[4];
int n = 0;
@@ -3046,9 +3057,6 @@ void SlaOutputDev::updateFont(GfxState *state)
SplashCoord matrix[6];
m_font = nullptr;
- fileName = nullptr;
- tmpBuf = nullptr;
- fontLoc = nullptr;
gfxFont = state->getFont();
if (!gfxFont)
@@ -3083,7 +3091,11 @@ void SlaOutputDev::updateFont(GfxState *state)
}
else
{ // gfxFontLocExternal
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ fileName = fontLoc->pathAsGooString();
+#else
fileName = fontLoc->path;
+#endif
fontType = fontLoc->fontType;
}
@@ -3136,9 +3148,14 @@ void SlaOutputDev::updateFont(GfxState *state)
ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
if (ff)
{
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ codeToGID = ((Gfx8BitFont*) gfxFont)->getCodeToGIDMap(ff.get());
+ ff.reset();
+#else
codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
- n = 256;
delete ff;
+#endif
+ n = 256;
}
else
{
@@ -3209,8 +3226,13 @@ void SlaOutputDev::updateFont(GfxState *state)
ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
if (! ff)
goto err2;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n);
+ ff.reset();
+#else
codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n);
delete ff;
+#endif
}
if (!(fontFile = m_fontEngine->loadTrueTypeFont(
id,
@@ -3247,14 +3269,19 @@ void SlaOutputDev::updateFont(GfxState *state)
mat[3] = -m22;
m_font = m_fontEngine->getFont(fontFile, mat, matrix);
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
delete fontLoc;
+#endif
if (fontsrc && !fontsrc->isFile)
fontsrc->unref();
return;
err2:
delete id;
+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 2, 0)
delete fontLoc;
+#endif
+
err1:
if (fontsrc && !fontsrc->isFile)
fontsrc->unref();

54
recipes-graphics/scribus/scribus/0002-Build-break-with-poppler-22.03.0.patch
View File

@@ -1,54 +0,0 @@
From f19410ac3b27e33dd62105746784e61e85b90a1d Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Wed, 2 Mar 2022 22:22:53 +0000
Subject: [PATCH] #16764: Build break with poppler 22.03.0
git-svn-id: svn://scribus.net/trunk/Scribus@24982 11d20701-8431-0410-a711-e3c959e3b870
Upstream-Status: Accepted
---
scribus/plugins/import/pdf/importpdf.cpp | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
index 154e58a3f0..392dcd9e64 100644
--- a/scribus/plugins/import/pdf/importpdf.cpp
+++ b/scribus/plugins/import/pdf/importpdf.cpp
@@ -89,7 +89,11 @@ QImage PdfPlug::readThumbnail(const QString& fName)
#endif
globalParams->setErrQuiet(gTrue);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ PDFDoc pdfDoc{ std::make_unique<GooString>(fname) };
+#else
PDFDoc pdfDoc{fname, nullptr, nullptr, nullptr};
+#endif
if (!pdfDoc.isOk() || pdfDoc.getErrorCode() == errEncrypted)
return QImage();
@@ -342,7 +346,11 @@ bool PdfPlug::convert(const QString& fn)
globalParams->setErrQuiet(gTrue);
// globalParams->setPrintCommands(gTrue);
QList<OptionalContentGroup*> ocgGroups;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ auto pdfDoc = std::make_unique<PDFDoc>(std::make_unique<GooString>(fname));
+#else
auto pdfDoc = std::unique_ptr<PDFDoc>(new PDFDoc(fname, nullptr, nullptr, nullptr));
+#endif
if (pdfDoc)
{
if (pdfDoc->getErrorCode() == errEncrypted)
@@ -361,8 +369,13 @@ bool PdfPlug::convert(const QString& fn)
#else
auto fname = new GooString(QFile::encodeName(fn).data());
#endif
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 3, 0)
+ std::optional<GooString> userPW(std::in_place, text.toLocal8Bit().data());
+ pdfDoc.reset(new PDFDoc(std::make_unique<GooString>(fname), userPW, userPW, nullptr));
+#else
auto userPW = new GooString(text.toLocal8Bit().data());
pdfDoc.reset(new PDFDoc(fname, userPW, userPW, nullptr));
+#endif
qApp->changeOverrideCursor(QCursor(Qt::WaitCursor));
}
if ((!pdfDoc) || (pdfDoc->getErrorCode() != errNone))

291
recipes-graphics/scribus/scribus/0003-Build-break-with-poppler-22.04.0.patch
View File

@@ -1,291 +0,0 @@
From f2237b8f0b5cf7690e864a22ef7a63a6d769fa36 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Fri, 1 Apr 2022 23:52:32 +0000
Subject: [PATCH] Fix build with poppler 22.04.0
git-svn-id: svn://scribus.net/trunk/Scribus@25074 11d20701-8431-0410-a711-e3c959e3b870
Upstream-Status: Backport[https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36]
---
scribus/plugins/import/pdf/slaoutput.cpp | 123 ++++++++++++++---------
1 file changed, 78 insertions(+), 45 deletions(-)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index e20a81f99e..5626fe3477 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -174,8 +174,13 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s)
int shade = 100;
currColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
fontSize = state->getFontSize();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ if (state->getFont() && state->getFont()->getName())
+ fontName = new GooString(state->getFont()->getName().value());
+#else
if (state->getFont())
fontName = state->getFont()->getName()->copy();
+#endif
itemText = s->copy();
}
@@ -357,7 +362,12 @@ std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key
GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
{
SlaOutputDev *dev = (SlaOutputDev*)user_data;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ const PDFRectangle& annotRect = annota->getRect();;
+ const PDFRectangle* box = &annotRect;
+#else
PDFRectangle *box = annota->getRect();
+#endif
double xCoor = dev->m_doc->currentPage()->xOffset() + box->x1 - dev->cropOffsetX;
double yCoor = dev->m_doc->currentPage()->yOffset() + dev->m_doc->currentPage()->height() - box->y2 + dev->cropOffsetY;
double width = box->x2 - box->x1;
@@ -684,7 +694,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor,
if (apa || !achar)
{
AnoOutputDev *annotOutDev = new AnoOutputDev(m_doc, m_importedColors);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ const PDFRectangle& annotaRect = annota->getRect();
+ Gfx* gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), &annotaRect, nullptr);
+#else
Gfx *gfx = new Gfx(pdfDoc, annotOutDev, pdfDoc->getPage(m_actPage)->getResourceDict(), annota->getRect(), nullptr);
+#endif
ano->draw(gfx, false);
if (!bgFound)
m_currColorFill = annotOutDev->currColorFill;
@@ -2916,22 +2931,27 @@ void SlaOutputDev::markPoint(POPPLER_CONST char *name, Dict *properties)
void SlaOutputDev::updateFont(GfxState *state)
{
- GfxFont *gfxFont;
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ std::optional<GfxFontLoc> fontLoc;
+ std::string fileName;
+ std::unique_ptr<FoFiTrueType> ff;
+ std::optional<std::vector<unsigned char>> tmpBuf;
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
std::optional<GfxFontLoc> fontLoc;
const GooString * fileName = nullptr;
std::unique_ptr<FoFiTrueType> ff;
+ char* tmpBuf = nullptr;
#else
GfxFontLoc * fontLoc = nullptr;
GooString * fileName = nullptr;
FoFiTrueType * ff = nullptr;
+ char* tmpBuf = nullptr;
#endif
GfxFontType fontType;
SlaOutFontFileID *id;
SplashFontFile *fontFile;
SplashFontSrc *fontsrc = nullptr;
Object refObj, strObj;
- char *tmpBuf = nullptr;
int tmpBufLen = 0;
int *codeToGID = nullptr;
const double *textMat = nullptr;
@@ -2943,7 +2963,11 @@ void SlaOutputDev::updateFont(GfxState *state)
m_font = nullptr;
- gfxFont = state->getFont();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ GfxFont* gfxFont = state->getFont().get();
+#else
+ GfxFont* gfxFont = state->getFont();
+#endif
if (!gfxFont)
goto err1;
@@ -2968,15 +2992,23 @@ void SlaOutputDev::updateFont(GfxState *state)
if (fontLoc->locType == gfxFontLocEmbedded)
{
// if there is an embedded font, read it to memory
- tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ tmpBuf = gfxFont->readEmbFontFile((xref) ? xref : pdfDoc->getXRef());
if (! tmpBuf)
goto err2;
+#else
+ tmpBuf = gfxFont->readEmbFontFile(xref, &tmpBufLen);
+ if (!tmpBuf)
+ goto err2;
+#endif
// external font
}
else
{ // gfxFontLocExternal
-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ fileName = fontLoc->path;
+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
fileName = fontLoc->pathAsGooString();
#else
fileName = fontLoc->path;
@@ -2985,52 +3017,54 @@ void SlaOutputDev::updateFont(GfxState *state)
}
fontsrc = new SplashFontSrc;
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ if (!fileName.empty())
+ fontsrc->setFile(fileName);
+ else
+ fontsrc->setBuf(std::move(tmpBuf.value()));
+#else
if (fileName)
fontsrc->setFile(fileName, gFalse);
else
fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
+#endif
// load the font file
switch (fontType) {
case fontType1:
- if (!(fontFile = m_fontEngine->loadType1Font(
- id,
- fontsrc,
- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ if (!(fontFile = m_fontEngine->loadType1Font(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
case fontType1C:
- if (!(fontFile = m_fontEngine->loadType1CFont(
- id,
- fontsrc,
- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ if (!(fontFile = m_fontEngine->loadType1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
case fontType1COT:
- if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(
- id,
- fontsrc,
- (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
+ if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont(id, fontsrc, (const char **)((Gfx8BitFont *) gfxFont)->getEncoding())))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
case fontTrueType:
case fontTrueTypeOT:
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ if (!fileName.empty())
+ ff = FoFiTrueType::load(fileName.c_str());
+ else
+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
+#else
if (fileName)
ff = FoFiTrueType::load(fileName->getCString());
else
ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+#endif
if (ff)
{
#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
@@ -3047,24 +3081,17 @@ void SlaOutputDev::updateFont(GfxState *state)
codeToGID = nullptr;
n = 0;
}
- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
- id,
- fontsrc,
- codeToGID, n)))
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n)))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
case fontCIDType0:
case fontCIDType0C:
- if (!(fontFile = m_fontEngine->loadCIDFont(
- id,
- fontsrc)))
+ if (!(fontFile = m_fontEngine->loadCIDFont(id, fontsrc)))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
@@ -3080,10 +3107,7 @@ void SlaOutputDev::updateFont(GfxState *state)
codeToGID = nullptr;
n = 0;
}
- if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(
- id,
- fontsrc,
- codeToGID, n)))
+ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(id, fontsrc, codeToGID, n)))
{
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
@@ -3105,10 +3129,17 @@ void SlaOutputDev::updateFont(GfxState *state)
}
else
{
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
+ if (!fileName.empty())
+ ff = FoFiTrueType::load(fileName.c_str());
+ else
+ ff = FoFiTrueType::make(fontsrc->buf.data(), fontsrc->buf.size());
+#else
if (fileName)
ff = FoFiTrueType::load(fileName->getCString());
else
ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
+#endif
if (! ff)
goto err2;
#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
@@ -3119,13 +3150,9 @@ void SlaOutputDev::updateFont(GfxState *state)
delete ff;
#endif
}
- if (!(fontFile = m_fontEngine->loadTrueTypeFont(
- id,
- fontsrc,
- codeToGID, n, faceIndex)))
+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(id, fontsrc, codeToGID, n, faceIndex)))
{
- error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
- gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
goto err2;
}
break;
@@ -3269,9 +3296,15 @@ void SlaOutputDev::drawChar(GfxState* state, double x, double y, double dx, doub
GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
{
// qDebug() << "beginType3Char";
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
GfxFont *gfxFont;
+ if (!(gfxFont = state->getFont().get()))
+ return gTrue;
+#else
+ GfxFont* gfxFont;
if (!(gfxFont = state->getFont()))
return gTrue;
+#endif
if (gfxFont->getType() != fontType3)
return gTrue;
F3Entry f3e;

39
recipes-graphics/scribus/scribus/0004-Build-break-with-poppler-22.09.0.patch
View File

@@ -1,39 +0,0 @@
From 8acd29e97813b9132e3b51b2f05e8fac65819ed7 Mon Sep 17 00:00:00 2001
From: Jean Ghali <jghali@libertysurf.fr>
Date: Thu, 1 Sep 2022 12:12:45 +0000
Subject: [PATCH] Fix build with poppler 22.09.0
git-svn-id: svn://scribus.net/trunk/Scribus@25140 11d20701-8431-0410-a711-e3c959e3b870
---
scribus/plugins/import/pdf/slaoutput.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
index 14a3e2f..c47840b 100644
--- a/scribus/plugins/import/pdf/slaoutput.cpp
+++ b/scribus/plugins/import/pdf/slaoutput.cpp
@@ -3741,6 +3741,13 @@ void SlaOutputDev::getPenState(GfxState *state)
break;
}
double lw = state->getLineWidth();
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
+ const auto& dashPattern = state->getLineDash(&DashOffset);
+ QVector<double> pattern(dashPattern.size());
+ for (size_t i = 0; i < dashPattern.size(); ++i)
+ pattern[i] = dashPattern[i];
+ DashValues = pattern;
+#else
double *dashPattern;
int dashLength;
state->getLineDash(&dashPattern, &dashLength, &DashOffset);
@@ -3750,6 +3757,7 @@ void SlaOutputDev::getPenState(GfxState *state)
pattern[i] = dashPattern[i] / lw;
}
DashValues = pattern;
+#endif
}
int SlaOutputDev::getBlendMode(GfxState *state)
--
2.35.3

36
recipes-graphics/scribus/scribus_1.5.8.bb
View File

@@ -1,36 +0,0 @@
SUMMARY = "Scribus: Open source desktop publishing"
HOMEPAGE = "https://www.scribus.net/"
LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & BSD-3-Clause & MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=300e791cb9c6b02206963fb25dfa9aa5"
inherit cmake_qt5 cmake_extra_sanity pkgconfig python3native gtk-icon-cache mime mime-xdg
DEPENDS += " \
qttools-native \
boost \
tiff \
lcms \
hunspell \
poppler \
"
# remove once we don't have patches any more
inherit dos2unix
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.tar.xz \
file://0001-Build-break-with-poppler-22.2.0.patch \
file://0002-Build-break-with-poppler-22.03.0.patch \
file://0003-Build-break-with-poppler-22.04.0.patch \
file://0004-Build-break-with-poppler-22.09.0.patch \
"
SRC_URI[sha256sum] = "47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74"
# necessary since poppler 21.01.0
EXTRA_OECMAKE = "-DWANT_CPP17=ON"
FILES:${PN} += " \
${datadir}/icons \
${datadir}/mime \
${datadir}/metainfo \
"

132
recipes-libreoffice/libreoffice/files/0001-Workaround-boost-library-detection-failures.patch
View File

@@ -1,132 +0,0 @@
From b5a988f79520d3ea39af37e9d726cf0aafb36019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 14:51:00 +0200
Subject: [PATCH] Workaround boost library detection failures
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
m4/ax_boost_date_time.m4 | 11 +++++------
m4/ax_boost_filesystem.m4 | 11 +++++------
m4/ax_boost_iostreams.m4 | 11 +++++------
m4/ax_boost_locale.m4 | 11 +++++------
m4/ax_boost_system.m4 | 11 +++++------
5 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/m4/ax_boost_date_time.m4 b/m4/ax_boost_date_time.m4
index 9b9ec67..0baac6c 100644
--- a/m4/ax_boost_date_time.m4
+++ b/m4/ax_boost_date_time.m4
@@ -92,12 +92,11 @@ AC_DEFUN([AX_BOOST_DATE_TIME],
fi
else
- for ax_lib in $ax_boost_user_date_time_lib boost_date_time-$ax_boost_user_date_time_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_DATE_TIME_LIB="-l$ax_lib"; AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
- [link_date_time="no"])
- done
-
+ # ld does not like our LDFLAGS so just trust we set library correctly...
+ ax_lib=${ax_boost_user_date_time_lib}
+ BOOST_DATE_TIME_LIB="-l$ax_lib"
+ AC_SUBST(BOOST_DATE_TIME_LIB)
+ link_date_time="yes"
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the boost date_time library!)
diff --git a/m4/ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4
index b571f89..3996791 100644
--- a/m4/ax_boost_filesystem.m4
+++ b/m4/ax_boost_filesystem.m4
@@ -96,12 +96,11 @@ AC_DEFUN([AX_BOOST_FILESYSTEM],
done
fi
else
- for ax_lib in $ax_boost_user_filesystem_lib boost_filesystem-$ax_boost_user_filesystem_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break],
- [link_filesystem="no"])
- done
-
+ # ld does not like our LDFLAGS so just trust we set library correctly...
+ ax_lib=${ax_boost_user_filesystem_lib}
+ BOOST_FILESYSTEM_LIB="-l$ax_lib"
+ AC_SUBST(BOOST_FILESYSTEM_LIB)
+ link_filesystem="yes"
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the boost filesystem library!)
diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4
index 803d3a3..d165f46 100644
--- a/m4/ax_boost_iostreams.m4
+++ b/m4/ax_boost_iostreams.m4
@@ -95,12 +95,11 @@ AC_DEFUN([AX_BOOST_IOSTREAMS],
fi
else
- for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
- AC_CHECK_LIB($ax_lib, main,
- [BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
- [link_iostreams="no"])
- done
-
+ # ld does not like our LDFLAGS so just trust we set library correctly...
+ ax_lib=${ax_boost_user_iostreams_lib}
+ BOOST_IOSTREAMS_LIB="-l$ax_lib"
+ AC_SUBST(BOOST_IOSTREAMS_LIB)
+ link_iostreams="yes"
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the boost iostreams library!)
diff --git a/m4/ax_boost_locale.m4 b/m4/ax_boost_locale.m4
index adaedf0..468d708 100644
--- a/m4/ax_boost_locale.m4
+++ b/m4/ax_boost_locale.m4
@@ -98,12 +98,11 @@ AC_DEFUN([AX_BOOST_LOCALE],
fi
else
- for ax_lib in $ax_boost_user_locale_lib boost_locale-$ax_boost_user_locale_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_LOCALE_LIB="-l$ax_lib"; AC_SUBST(BOOST_LOCALE_LIB) link_locale="yes"; break],
- [link_locale="no"])
- done
-
+ # ld does not like our LDFLAGS so just trust we set library correctly...
+ ax_lib=${ax_boost_user_locale_lib}
+ BOOST_LOCALE_LIB="-l$ax_lib"
+ AC_SUBST(BOOST_LOCALE_LIB)
+ link_locale="yes"
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index 139d066..889b05d 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -100,12 +100,11 @@ AC_DEFUN([AX_BOOST_SYSTEM],
fi
else
- for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
- AC_CHECK_LIB($ax_lib, exit,
- [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
- [link_system="no"])
- done
-
+ # ld does not like our LDFLAGS so just trust we set library correctly...
+ ax_lib=${ax_boost_user_system_lib}
+ BOOST_SYSTEM_LIB="-l$ax_lib"
+ AC_SUBST(BOOST_SYSTEM_LIB)
+ link_system="yes"
fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the boost system library!)
--
2.21.0

182
recipes-libreoffice/libreoffice/files/0001-update-ax_boost-scripts-to-fix-configure-with-system.patch Normal file
View File

@@ -0,0 +1,182 @@
From dfba581f6d1dd64fc69ef9db9fc27059366e3f8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 29 Oct 2015 00:23:24 +0100
Subject: [PATCH] update ax_boost scripts to fix configure with system boost
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
m4/ax_boost_base.m4 | 87 +++++++++++++++++++++++++++++++--------------------
m4/ax_boost_system.m4 | 6 ++--
2 files changed, 56 insertions(+), 37 deletions(-)
diff --git a/m4/ax_boost_base.m4 b/m4/ax_boost_base.m4
index 55de0c4..f3279f2 100644
--- a/m4/ax_boost_base.m4
+++ b/m4/ax_boost_base.m4
@@ -33,7 +33,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 20
+#serial 26
AC_DEFUN([AX_BOOST_BASE],
[
@@ -91,12 +91,29 @@ if test "x$want_boost" = "xyes"; then
dnl are found, e.g. when only header-only libraries are installed!
libsubdirs="lib"
ax_arch=`uname -m`
- if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = ppc64le -o $ax_arch = s390x -o $ax_arch = sparc64 -o $ax_arch = aarch64; then
- libsubdirs="lib64 lib lib64"
- fi
+ case $ax_arch in
+ x86_64)
+ libsubdirs="lib64 libx32 lib lib64"
+ ;;
+ ppc64|s390x|sparc64|aarch64|ppc64le)
+ libsubdirs="lib64 lib lib64 ppc64le"
+ ;;
+ esac
+
+ dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
+ dnl them priority over the other paths since, if libs are found there, they
+ dnl are almost assuredly the ones desired.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
+
+ case ${host_cpu} in
+ i?86)
+ libsubdirs="lib/i386-${host_os} $libsubdirs"
+ ;;
+ esac
dnl first we check the system location for boost libraries
- dnl this location is chosen if boost libraries are installed with the --layout=system option
+ dnl this location ist chosen if boost libraries are installed with the --layout=system option
dnl or if you install boost with RPM
if test "$ac_boost_path" != ""; then
BOOST_CPPFLAGS="-I$ac_boost_path/include"
@@ -106,13 +123,8 @@ if test "x$want_boost" = "xyes"; then
break
fi
done
- else
- if test "$cross_compiling" != yes; then
- ac_boost_paths='/usr /usr/local /opt /opt/local'
- else
- ac_boost_paths="/usr/$host/sys-root/mingw"
- fi
- for ac_boost_path_tmp in $ac_boost_paths ; do
+ elif test "$cross_compiling" != yes; then
+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
for libsubdir in $libsubdirs ; do
if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
@@ -161,6 +173,10 @@ if test "x$want_boost" = "xyes"; then
dnl if we found no boost with system layout we search for boost libraries
dnl built and installed without the --layout=system option or for a staged(not installed) version
if test "x$succeeded" != "xyes"; then
+ CPPFLAGS="$CPPFLAGS_SAVED"
+ LDFLAGS="$LDFLAGS_SAVED"
+ BOOST_CPPFLAGS=
+ BOOST_LDFLAGS=
_version=0
if test "$ac_boost_path" != ""; then
if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
@@ -173,33 +189,36 @@ if test "x$want_boost" = "xyes"; then
VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
done
+ dnl if nothing found search for layout used in Windows distributions
+ if test -z "$BOOST_CPPFLAGS"; then
+ if test -d "$ac_boost_path/boost" && test -r "$ac_boost_path/boost"; then
+ BOOST_CPPFLAGS="-I$ac_boost_path"
+ fi
+ fi
fi
else
if test "$cross_compiling" != yes; then
- ac_boost_paths='/usr /usr/local /opt /opt/local'
- else
- ac_boost_paths="/usr/$host/sys-root/mingw"
- fi
- for ac_boost_path in $ac_boost_paths ; do
- if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
- for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
- _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
- V_CHECK=`expr $_version_tmp \> $_version`
- if test "$V_CHECK" = "1" ; then
- _version=$_version_tmp
- best_path=$ac_boost_path
- fi
+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
+ V_CHECK=`expr $_version_tmp \> $_version`
+ if test "$V_CHECK" = "1" ; then
+ _version=$_version_tmp
+ best_path=$ac_boost_path
+ fi
+ done
+ fi
+ done
+
+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
+ if test "$ac_boost_lib_path" = ""; then
+ for libsubdir in $libsubdirs ; do
+ if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
done
+ BOOST_LDFLAGS="-L$best_path/$libsubdir"
fi
- done
-
- VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
- BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
- if test "$ac_boost_lib_path" = ""; then
- for libsubdir in $libsubdirs ; do
- if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
- done
- BOOST_LDFLAGS="-L$best_path/$libsubdir"
fi
if test "x$BOOST_ROOT" != "x"; then
diff --git a/m4/ax_boost_system.m4 b/m4/ax_boost_system.m4
index 20df5ee..c4c4555 100644
--- a/m4/ax_boost_system.m4
+++ b/m4/ax_boost_system.m4
@@ -31,7 +31,7 @@
# and this notice are preserved. This file is offered as-is, without any
# warranty.
-#serial 15
+#serial 17
AC_DEFUN([AX_BOOST_SYSTEM],
[
@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM],
LDFLAGS_SAVE=$LDFLAGS
if test "x$ax_boost_user_system_lib" = "x"; then
- for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
+ for libextension in `ls -r $BOOSTLIBDIR/libboost_system* 2>/dev/null | sed 's,.*/lib,,' | sed 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
[link_system="no"])
done
if test "x$link_system" != "xyes"; then
- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
+ for libextension in `ls -r $BOOSTLIBDIR/boost_system* 2>/dev/null | sed 's,.*/,,' | sed -e 's,\..*,,'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break],
--
2.1.0

43
recipes-libreoffice/libreoffice/files/0002-Fix-build-with-icu-68.patch
View File

@@ -1,43 +0,0 @@
From 389e500a5bda3c463bc3c57f49c23fcd477ece0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 2 Dec 2020 22:00:50 +0100
Subject: [PATCH] Fix build with icu >= 68
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| <...>/i18npool/source/calendar/calendar_gregorian.cxx:350:40: error: ‘TRUE’ was not declared in this scope
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
i18npool/source/calendar/calendar_gregorian.cxx | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index b7ae49f..3bb1433 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -33,6 +33,18 @@
#include <stdio.h>
#include <string.h>
+// Since icu 68.1 icu we have to:
+#ifndef TRUE
+// Taken from umachibe.h:
+/**
+ * The TRUE value of a UBool.
+ *
+ * @deprecated ICU 68 Use standard "true" instead.
+ */
+# define TRUE true
+#endif
+
+
#define erDUMP_ICU_CALENDAR 0
#define erDUMP_I18N_CALENDAR 0
#if erDUMP_ICU_CALENDAR || erDUMP_I18N_CALENDAR
--
2.26.2

44
recipes-libreoffice/libreoffice/files/0002-fix-gcc-build-error.patch Normal file
View File

@@ -0,0 +1,44 @@
From b9fa2963cf12e6987b3a0acc219c4fa591e41be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 3 Feb 2016 10:30:43 +0000
Subject: [PATCH] fix gcc build error
error: invalid operands of types '__gnu_cxx::__enable_if<true, double>::__type
{aka double}' and 'int' to binary 'operator%'
apparently there's a template returning double for abs for the
non-int/long/float/double argument case. So promote earlier to int so the
abs<int> is called
Change-Id: I882a27c5ec349f894c1c9f4857687360a46b55ae
Upstream-Status: Backport
---
sax/source/tools/converter.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 744415e..cf061c9 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -1250,7 +1250,7 @@ bool Converter::convertDuration(util::Duration& rDuration,
static void
-lcl_AppendTimezone(OUStringBuffer & i_rBuffer, sal_Int16 const nOffset)
+lcl_AppendTimezone(OUStringBuffer & i_rBuffer, int const nOffset)
{
if (0 == nOffset)
{
@@ -1435,7 +1435,7 @@ lcl_MaxDaysPerMonth(const sal_Int32 nMonth, const sal_Int32 nYear)
static void lcl_ConvertToUTC(
sal_Int16 & o_rYear, sal_uInt16 & o_rMonth, sal_uInt16 & o_rDay,
sal_uInt16 & o_rHours, sal_uInt16 & o_rMinutes,
- sal_Int16 const nSourceOffset)
+ int const nSourceOffset)
{
sal_Int16 nOffsetHours(abs(nSourceOffset) / 60);
sal_Int16 const nOffsetMinutes(abs(nSourceOffset) % 60);
--
2.7.4

246
recipes-libreoffice/libreoffice/files/0003-upgrade-to-ICU-58.patch Normal file
View File

@@ -0,0 +1,246 @@
From 3e42714c76b1347babfdea0564009d8d82a83af4 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Wed, 2 Nov 2016 13:07:48 +0100
Subject: [PATCH] upgrade to ICU 58
Change-Id: I4a992447df65b337721a2a2627d974172a14cba5
Reviewed-on: https://gerrit.libreoffice.org/30487
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
Upstream-Status: Backport
---
configure.ac | 2 +-
.../source/breakiterator/breakiterator_unicode.cxx | 12 ++++++
i18nutil/source/utility/unicode.cxx | 26 +++++++++++++
include/svx/ucsubset.hrc | 11 ++++++
svx/source/dialog/charmap.cxx | 35 +++++++++++++++++
svx/source/dialog/ucsubset.src | 44 ++++++++++++++++++++++
9 files changed, 130 insertions(+), 25 deletions(-)
diff --git a/configure.ac b/configure.ac
index f06ef8e..66a11a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9136,7 +9136,7 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
-ICU_MAJOR=54
+ICU_MAJOR=58
ICU_MINOR=1
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="TRUE"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="TRUE"
diff --git a/download.lst b/download.lst
index 4571338..0770a4d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -63,10 +63,13 @@ BreakIterator_Unicode::~BreakIterator_Unicode()
class OOoRuleBasedBreakIterator : public RuleBasedBreakIterator
{
public:
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // RuleBasedBreakIterator::setBreakType() is private as of ICU 58.
inline void publicSetBreakType(int32_t type)
{
setBreakType(type);
};
+#endif
OOoRuleBasedBreakIterator(UDataMemory* image,
UErrorCode &status)
: RuleBasedBreakIterator(image, status)
@@ -142,12 +145,21 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const css::lang::Local
}
}
if (rbi) {
+#if (U_ICU_VERSION_MAJOR_NUM < 58)
+ // ICU 58 made RuleBasedBreakIterator::setBreakType() private
+ // instead of protected, so the old workaround of
+ // https://ssl.icu-project.org/trac/ticket/5498
+ // doesn't work anymore. However, they also claim to have fixed
+ // the cause that an initial fBreakType==-1 would lead to an
+ // endless loop under some circumstances.
+ // Let's see ...
switch (rBreakType) {
case LOAD_CHARACTER_BREAKITERATOR: rbi->publicSetBreakType(UBRK_CHARACTER); break;
case LOAD_WORD_BREAKITERATOR: rbi->publicSetBreakType(UBRK_WORD); break;
case LOAD_SENTENCE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_SENTENCE); break;
case LOAD_LINE_BREAKITERATOR: rbi->publicSetBreakType(UBRK_LINE); break;
}
+#endif
icuBI->aBreakIterator = rbi;
}
}
diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index bb82bbf..984c5f7 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -957,6 +957,32 @@ OString SAL_CALL unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
sRet = "sa-Sidd";
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
+ case USCRIPT_ADLAM:
+ sRet = "mis"; // Adlm - Adlam for Fulani, no language code
+ break;
+ case USCRIPT_BHAIKSUKI:
+ sRet = "mis"; // Bhks - Bhaiksuki for some Buddhist texts, no language code
+ break;
+ case USCRIPT_MARCHEN:
+ sRet = "bo-Marc";
+ break;
+ case USCRIPT_NEWA:
+ sRet = "new-Newa";
+ break;
+ case USCRIPT_OSAGE:
+ sRet = "osa-Osge";
+ break;
+ case USCRIPT_HAN_WITH_BOPOMOFO:
+ sRet = "mis"; // Hanb - Han with Bopomofo, zh-Hanb ?
+ break;
+ case USCRIPT_JAMO:
+ sRet = "mis"; // Jamo - Jamo subset of Hangul, ko-Jamo ?
+ break;
+ case USCRIPT_SYMBOLS_EMOJI:
+ sRet = "mis"; // Zsye - Emoji variant
+ break;
+#endif
}
return sRet;
}
diff --git a/include/svx/ucsubset.hrc b/include/svx/ucsubset.hrc
index adf1cf6..1157a7e 100644
--- a/include/svx/ucsubset.hrc
+++ b/include/svx/ucsubset.hrc
@@ -281,6 +281,27 @@
#define RID_SUBSETSTR_SUPPLEMENTAL_ARROWS_C (RID_SUBSET_START + 253)
#define RID_SUBSETSTR_TIRHUTA (RID_SUBSET_START + 254)
#define RID_SUBSETSTR_WARANG_CITI (RID_SUBSET_START + 255)
+#define RID_SUBSETSTR_AHOM (RID_SUBSET_START + 256)
+#define RID_SUBSETSTR_ANATOLIAN_HIEROGLYPHS (RID_SUBSET_START + 257)
+#define RID_SUBSETSTR_CHEROKEE_SUPPLEMENT (RID_SUBSET_START + 258)
+#define RID_SUBSETSTR_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E (RID_SUBSET_START + 259)
+#define RID_SUBSETSTR_EARLY_DYNASTIC_CUNEIFORM (RID_SUBSET_START + 260)
+#define RID_SUBSETSTR_HATRAN (RID_SUBSET_START + 261)
+#define RID_SUBSETSTR_MULTANI (RID_SUBSET_START + 262)
+#define RID_SUBSETSTR_OLD_HUNGARIAN (RID_SUBSET_START + 263)
+#define RID_SUBSETSTR_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS (RID_SUBSET_START + 264)
+#define RID_SUBSETSTR_SUTTON_SIGNWRITING (RID_SUBSET_START + 265)
+#define RID_SUBSETSTR_ADLAM (RID_SUBSET_START + 266)
+#define RID_SUBSETSTR_BHAIKSUKI (RID_SUBSET_START + 267)
+#define RID_SUBSETSTR_CYRILLIC_EXTENDED_C (RID_SUBSET_START + 268)
+#define RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT (RID_SUBSET_START + 269)
+#define RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION (RID_SUBSET_START + 270)
+#define RID_SUBSETSTR_MARCHEN (RID_SUBSET_START + 271)
+#define RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT (RID_SUBSET_START + 272)
+#define RID_SUBSETSTR_NEWA (RID_SUBSET_START + 273)
+#define RID_SUBSETSTR_OSAGE (RID_SUBSET_START + 274)
+#define RID_SUBSETSTR_TANGUT (RID_SUBSET_START + 275)
+#define RID_SUBSETSTR_TANGUT_COMPONENTS (RID_SUBSET_START + 276)
// RID_SUBSET_END (RID_SUBSET_START + 299)
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index bcc7cef..ff201a6 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -1594,6 +1594,41 @@ void SubsetMap::InitList()
aAllSubsets.push_back( Subset( 0x1D800, 0x1DAAF, RID_SUBSETSTR_SUTTON_SIGNWRITING ) );
break;
#endif
+#if (U_ICU_VERSION_MAJOR_NUM >= 58)
+ case UBLOCK_ADLAM:
+ aAllSubsets.push_back( Subset( 0x1E900, 0x1E95F, RID_SUBSETSTR_ADLAM ) );
+ break;
+ case UBLOCK_BHAIKSUKI:
+ aAllSubsets.push_back( Subset( 0x11C00, 0x11C6F, RID_SUBSETSTR_BHAIKSUKI ) );
+ break;
+ case UBLOCK_CYRILLIC_EXTENDED_C:
+ aAllSubsets.push_back( Subset( 0x1C80, 0x1C8F, RID_SUBSETSTR_CYRILLIC_EXTENDED_C ) );
+ break;
+ case UBLOCK_GLAGOLITIC_SUPPLEMENT:
+ aAllSubsets.push_back( Subset( 0x1E000, 0x1E02F, RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT ) );
+ break;
+ case UBLOCK_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION:
+ aAllSubsets.push_back( Subset( 0x16FE0, 0x16FFF, RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION ) );
+ break;
+ case UBLOCK_MARCHEN:
+ aAllSubsets.push_back( Subset( 0x11C70, 0x11CBF, RID_SUBSETSTR_MARCHEN ) );
+ break;
+ case UBLOCK_MONGOLIAN_SUPPLEMENT:
+ aAllSubsets.push_back( Subset( 0x11660, 0x1167F, RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT ) );
+ break;
+ case UBLOCK_NEWA:
+ aAllSubsets.push_back( Subset( 0x11400, 0x1147F, RID_SUBSETSTR_NEWA ) );
+ break;
+ case UBLOCK_OSAGE:
+ aAllSubsets.push_back( Subset( 0x104B0, 0x104FF, RID_SUBSETSTR_OSAGE ) );
+ break;
+ case UBLOCK_TANGUT:
+ aAllSubsets.push_back( Subset( 0x17000, 0x187FF, RID_SUBSETSTR_TANGUT ) );
+ break;
+ case UBLOCK_TANGUT_COMPONENTS:
+ aAllSubsets.push_back( Subset( 0x18800, 0x18AFF, RID_SUBSETSTR_TANGUT_COMPONENTS ) );
+ break;
+#endif
}
diff --git a/svx/source/dialog/ucsubset.src b/svx/source/dialog/ucsubset.src
index 06630cc..a7765c3 100644
--- a/svx/source/dialog/ucsubset.src
+++ b/svx/source/dialog/ucsubset.src
@@ -1079,6 +1079,50 @@ Resource RID_SUBSETMAP
{
Text [ en-US ] = "Sutton Signwriting";
};
+ String RID_SUBSETSTR_ADLAM
+ {
+ Text [ en-US ] = "Adlam";
+ };
+ String RID_SUBSETSTR_BHAIKSUKI
+ {
+ Text [ en-US ] = "Bhaiksuki";
+ };
+ String RID_SUBSETSTR_CYRILLIC_EXTENDED_C
+ {
+ Text [ en-US ] = "Cyrillic Extended-C";
+ };
+ String RID_SUBSETSTR_GLAGOLITIC_SUPPLEMENT
+ {
+ Text [ en-US ] = "Glagolitic Supplement";
+ };
+ String RID_SUBSETSTR_IDEOGRAPHIC_SYMBOLS_AND_PUNCTUATION
+ {
+ Text [ en-US ] = "Ideographic Symbols and Punctuation";
+ };
+ String RID_SUBSETSTR_MARCHEN
+ {
+ Text [ en-US ] = "Marchen";
+ };
+ String RID_SUBSETSTR_MONGOLIAN_SUPPLEMENT
+ {
+ Text [ en-US ] = "Mongolian Supplement";
+ };
+ String RID_SUBSETSTR_NEWA
+ {
+ Text [ en-US ] = "Newa";
+ };
+ String RID_SUBSETSTR_OSAGE
+ {
+ Text [ en-US ] = "Osage";
+ };
+ String RID_SUBSETSTR_TANGUT
+ {
+ Text [ en-US ] = "Tangut";
+ };
+ String RID_SUBSETSTR_TANGUT_COMPONENTS
+ {
+ Text [ en-US ] = "Tangut Components";
+ };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
2.7.4

32
recipes-libreoffice/libreoffice/files/0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch Normal file
View File

@@ -0,0 +1,32 @@
From 42cc1bf76716940ea381efc6e18fd087df63c2c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 15 Apr 2017 11:23:40 +0200
Subject: [PATCH] remove dictmgr.hxx to be compatible with later hunspell
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Backport [1]
https://github.com/LibreOffice/core/commit/072b32442e3f6f220936a93ad1fcbde57746b747
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 1 -
1 file changed, 1 deletion(-)
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 706f8b7..73d124c 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -29,7 +29,6 @@
#include <lingutil.hxx>
#include <hunspell.hxx>
-#include <dictmgr.hxx>
#include <sspellimp.hxx>
#include <linguistic/lngprops.hxx>
--
2.9.3

29
recipes-libreoffice/libreoffice/files/0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch Normal file
View File

@@ -0,0 +1,29 @@
From 3ca26ac9c7d3ff28e7687215115fa832f43ca06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 6 Jul 2017 14:58:15 +0200
Subject: [PATCH] packedpixeliterator.hxx: fix typo detected by gcc7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
include/basebmp/packedpixeliterator.hxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/basebmp/packedpixeliterator.hxx b/include/basebmp/packedpixeliterator.hxx
index 1b99bf9..d3d9ad2 100644
--- a/include/basebmp/packedpixeliterator.hxx
+++ b/include/basebmp/packedpixeliterator.hxx
@@ -603,7 +603,7 @@ public:
value_type get(difference_type const & d) const
{
- const int remainder( x(d.x) % num_intraword_positions );
+ const int remainder( (x + d.x) % num_intraword_positions );
return (unsigned_cast<value_type>(*current(d.x,d.y) &
get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
--
2.9.4

97
recipes-libreoffice/libreoffice/libreoffice-native.bb
View File

@@ -5,57 +5,97 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/${PN}:"
inherit native
DEPENDS += " \
cairo-native \
libepoxy-native \
curl-native \
gconf-native \
libpng-native \
jpeg-native \
libxml2-native \
graphite2-native \
harfbuzz-native \
boost-native \
icu-native \
expat-native \
lcms-native \
nss-native \
cppunit-native \
libabw-native \
libcdr-native \
libe-book-native \
libfreehand-native \
hunspell-native \
mythes-native \
clucene-core-native \
libcmis-native \
mdds-native \
libpagemaker-native \
glm-native \
libetonyek-native \
vigra-native \
libvisio-native \
libexttextcat-native \
hyphen-native \
unzip-native \
liblangtag-native \
lpsolve-native \
mdds-2.0-native \
neon-native \
"
SRC_URI += " \
file://0001-saxparser-output-calling-parametrs-for-debug.patch \
file://0002-cppuhelper-defaultbootstrap-output-debug-information.patch \
file://0003-add-gengal-debug-information.patch \
file://0004-gengal-fix-path-to-redirectrc.patch \
file://0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch \
file://0006-Do-not-fetch-fonts-for-native-tools.patch \
file://0002-cppumaker-output-more-detailed-error-message.patch \
file://0003-cppuhelper-defaultbootstrap-output-debug-information.patch \
file://0004-fix-build-for-x-less-cairp-less-build.patch \
file://0005-add-gengal-debug-information.patch \
file://0006-gengal-fix-path-to-redirectrc.patch \
"
EXTRA_OECONF += " \
--enable-python=system \
--without-x \
--without-java \
\
--disable-gui \
--disable-extensions \
--disable-extension-integration \
--with-system-curl \
--with-system-libpng \
--with-system-jpeg \
--with-system-libxml \
--with-system-harfbuzz \
--with-system-boost \
--with-system-icu \
--with-system-expat \
--with-system-lcms2 \
--with-system-nss \
--with-system-cppunit \
--with-system-libabw \
--with-system-libcdr \
--with-system-libebook \
--with-system-libfreehand \
--with-system-hunspell \
--with-system-mythes \
--with-system-clucene \
--with-system-libcmis \
--with-system-mdds \
--with-system-libpagemaker \
--with-system-glm \
--with-system-libetonyek \
--with-system-vigra \
--with-system-libvisio \
--with-system-libexttextcat \
--with-system-altlinuxhyph \
--with-system-neon \
\
--disable-mariadb-sdbc \
--without-boost-date-time \
--without-boost-iostreams \
--without-boost-system \
--disable-postgresql-sdbc \
--disable-lotuswordpro \
--disable-firebird-sdbc \
--disable-liblangtag \
--disable-openssl \
--disable-gltf \
--disable-collada \
--disable-scripting-beanshell \
--disable-scripting-javascript \
--disable-graphite \
--disable-pdfimport \
--disable-orcus \
--disable-coinmp \
--disable-opencl \
--disable-zxing \
"
do_configure() {
@@ -65,30 +105,26 @@ do_configure() {
gnu-configize
autoconf
cd $olddir
PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR}${PYTHON_ABI} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" oe_runconf
# fake for cross-toolset
cp -f ${B}/config_host.mk ${B}/config_build.mk
cp -f ${B}/config_host_lang.mk ${B}/config_build_lang.mk
cp -rf ${B}/config_host ${B}/config_build
PYTHON_CFLAGS=-I${STAGING_INCDIR_NATIVE}/${PYTHON_DIR} PYTHON_LIBS="-L${STAGING_LIBDIR_NATIVE} -lpython${PYTHON_BASEVERSION}" oe_runconf
}
# for debugging - we can as we're native
CXXFLAGS += "-g -O0 -DSAL_LOG_INFO -DSAL_LOG_WARN"
LDFLAGS += "-g"
# these seem to get lost in our tailored build
LDFLAGS += "-ldl"
do_compile() {
BUILDDIR=${B} oe_runmake cross-toolset
# gengal was not designed for build - we need to add it and it's dependencies
# inspired by ${B}/Makefile
BUILDDIR=${B} oe_runmake -f ${S}/Makefile.gbuild build-tools
# gengal was not designed for build on its own - we need to add dependencies
BUILDDIR=${B} oe_runmake Executable_gengal
BUILDDIR=${B} oe_runmake Executable_cfgex
BUILDDIR=${B} oe_runmake Library_ucb1
BUILDDIR=${B} oe_runmake Library_configmgr
BUILDDIR=${B} oe_runmake Library_fwk
BUILDDIR=${B} oe_runmake Library_i18npool
BUILDDIR=${B} oe_runmake Library_pyuno
# BUILDDIR=${B} oe_runmake Module_external
}
LOBUILDTOOLS = " \
@@ -100,10 +136,14 @@ LOBUILDTOOLS = " \
genindex_data \
idxdict \
propex \
rsc \
saxparser \
svidl \
transex3 \
ulfex \
uiex \
unoidl-check \
unoidl-write \
xrmex \
"
@@ -112,7 +152,6 @@ do_install() {
for name in ${LOBUILDTOOLS} ; do
install "${B}/workdir/LinkTarget/Executable/$name" ${D}/${bindir}
done
install "${B}/workdir/Headers/Executable/unoidl-write" ${D}/${bindir}
# icu creates a gendict. To avoid conflicts rename in sysroot
install "${B}/workdir/LinkTarget/Executable/gendict" ${D}/${bindir}/gendict_libre

4
recipes-libreoffice/libreoffice/libreoffice-native/0001-saxparser-output-calling-parametrs-for-debug.patch
View File

@@ -1,5 +1,5 @@
From c3baa66501375419563ba6d44685df347ae09a8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 22 Nov 2015 21:44:04 +0100
Subject: [PATCH] saxparser: output calling parametrs for debug
MIME-Version: 1.0
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
i18npool/source/localedata/saxparser.cxx | 2 ++
1 file changed, 2 insertions(+)

35
recipes-libreoffice/libreoffice/libreoffice-native/0002-cppumaker-output-more-detailed-error-message.patch Normal file
View File

@@ -0,0 +1,35 @@
From 98774bf61294703183118b7953f6a92cad6da068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 26 Nov 2015 17:48:19 +0100
Subject: [PATCH] cppumaker: output more detailed error message
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
codemaker/source/cppumaker/cpputype.cxx | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 0b3e9fd..26a9a73 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3385,11 +3385,7 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
{
return OUString(
"\n"
- "#if OSL_DEBUG_LEVEL > 0\n"
- " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
- "#else\n"
- " ::rtl::OUString(\"service not supplied\")\n"
- "#endif\n");
+ " ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n");
}
void ServiceType::dumpHxxFile(
--
2.1.0

20
recipes-libreoffice/libreoffice/libreoffice-native/0002-cppuhelper-defaultbootstrap-output-debug-information.patch → recipes-libreoffice/libreoffice/libreoffice-native/0003-cppuhelper-defaultbootstrap-output-debug-information.patch
View File

@@ -1,6 +1,6 @@
From 4577fbcae9790d88f6ccc5de07dd8dbff9d9cf97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 18:15:28 +0200
From 691674ce51be55f02464c6b6180680a41a64f906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 1 Dec 2015 00:09:32 +0100
Subject: [PATCH] cppuhelper / defaultbootstrap: output debug information in
getBootstrapVariable
MIME-Version: 1.0
@@ -9,18 +9,18 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
cppuhelper/source/defaultbootstrap.cxx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
index 945268b..3259d43 100644
index 1fbbf8f..75160e8 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -11,6 +11,7 @@
#include <sal/config.h>
#include <cassert>
#include <vector>
+#include <stdio.h>
@@ -32,9 +32,9 @@ index 945268b..3259d43 100644
#include <rtl/ustring.hxx>
+#include <rtl/string.hxx>
#include "macro_expander.hxx"
#include "paths.hxx"
@@ -38,6 +40,10 @@ OUString getBootstrapVariable(
using rtl::OUString;
@@ -40,6 +42,10 @@ rtl::OUString getBootstrapVariable(
throw css::uno::DeploymentException(
"Cannot obtain " + name + " from uno ini");
}
@@ -46,5 +46,5 @@ index 945268b..3259d43 100644
}
--
2.21.0
2.1.0

72
recipes-libreoffice/libreoffice/libreoffice-native/0004-fix-build-for-x-less-cairp-less-build.patch Normal file
View File

@@ -0,0 +1,72 @@
From 5caf9ca138e89434249f2878334231011e382687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 18 Dec 2015 22:09:29 +0100
Subject: [PATCH] fix build for x-less/cairo-less build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: submitted [1]
[1] https://bugs.documentfoundation.org/show_bug.cgi?id=96587
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
vcl/headless/svpgdi.cxx | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index 21efd33..d1f4df1 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -645,6 +645,7 @@ void SvpSalGraphics::drawPolyPolygon( sal_uInt32 nPoly,
dbgOut( m_aDevice );
}
+#if ENABLE_CAIRO_CANVAS
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, bool bClosePath)
{
@@ -707,6 +708,7 @@ static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, b
}
}
#endif
+#endif
bool SvpSalGraphics::drawPolyLine(
const ::basegfx::B2DPolygon& rPolyLine,
@@ -717,6 +719,7 @@ bool SvpSalGraphics::drawPolyLine(
{
bool bRet = false;
(void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; (void)eLineCap;
+#if ENABLE_CAIRO_CANVAS
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
// short circuit if there is nothing to do
const int nPointCount = rPolyLine.count();
@@ -825,6 +828,7 @@ bool SvpSalGraphics::drawPolyLine(
}
bRet = true;
#endif
+#endif
return bRet;
}
@@ -857,6 +861,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
{
bool bRet = false;
(void)rPolyPoly; (void)fTransparency;
+#if ENABLE_CAIRO_CANVAS
#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
if (m_bUseLineColor || !m_bUseFillColor)
{
@@ -901,6 +906,7 @@ bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, d
}
bRet = true;
#endif
+#endif
return bRet;
}
--
2.5.0

83
recipes-libreoffice/libreoffice/libreoffice-native/0005-Do-not-check-download-lib-unnecessary-for-native-bui.patch
View File

@@ -1,83 +0,0 @@
From ecbbe1230e6cc2558cf0cacecb380d990b1aa65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 19 Aug 2021 15:35:53 +0200
Subject: [PATCH] Do not check / download lib unnecessary for native build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 56 ----------------------------------------------------
1 file changed, 56 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8babc85..8b910ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9564,62 +9564,6 @@ libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28])
libo_CHECK_SYSTEM_MODULE([eot],[LIBEOT],[libeot >= 0.01],disabled)
-dnl ===================================================================
-dnl Check for DLP libs
-dnl ===================================================================
-REVENGE_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/librevenge/inc"
-AS_IF([test "$COM" = "MSC"],
- [librevenge_libdir="${WORKDIR}/LinkTarget/Library"],
- [librevenge_libdir="${WORKDIR}/UnpackedTarball/librevenge/src/lib/.libs"]
-)
-REVENGE_LIBS_internal="-L${librevenge_libdir} -lrevenge-0.0"
-libo_CHECK_SYSTEM_MODULE([librevenge],[REVENGE],[librevenge-0.0 >= 0.0.1])
-
-libo_CHECK_SYSTEM_MODULE([libodfgen],[ODFGEN],[libodfgen-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libepubgen],[EPUBGEN],[libepubgen-0.1])
-
-WPD_CFLAGS_internal="-I${WORKDIR}/UnpackedTarball/libwpd/inc"
-AS_IF([test "$COM" = "MSC"],
- [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
- [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
-)
-WPD_LIBS_internal="-L${libwpd_libdir} -lwpd-0.10"
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10])
-
-libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
-
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.12])
-
-libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.21])
-libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.21])
-
-libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1])
-libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.10])
-
-libo_CHECK_SYSTEM_MODULE([libfreehand],[FREEHAND],[libfreehand-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libebook],[EBOOK],[libe-book-0.1])
-libo_PKG_VERSION([EBOOK], [libe-book-0.1], [0.1.2])
-
-libo_CHECK_SYSTEM_MODULE([libabw],[ABW],[libabw-0.1])
-
-libo_CHECK_SYSTEM_MODULE([libpagemaker],[PAGEMAKER],[libpagemaker-0.0])
-
-libo_CHECK_SYSTEM_MODULE([libqxp],[QXP],[libqxp-0.0])
-
-libo_CHECK_SYSTEM_MODULE([libzmf],[ZMF],[libzmf-0.0])
-
-libo_CHECK_SYSTEM_MODULE([libstaroffice],[STAROFFICE],[libstaroffice-0.0])
-libo_PKG_VERSION([STAROFFICE], [libstaroffice-0.0], [0.0.7])
-
dnl ===================================================================
dnl Check for system lcms2
dnl ===================================================================
--
2.35.3

4
recipes-libreoffice/libreoffice/libreoffice-native/0003-add-gengal-debug-information.patch → recipes-libreoffice/libreoffice/libreoffice-native/0005-add-gengal-debug-information.patch
View File

@@ -1,12 +1,12 @@
From d15275f988ea61b7ef128ac52f55906500728d7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 20 Jan 2016 20:51:02 +0100
Subject: [PATCH] add gengal debug information
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
svx/source/gengal/gengal.sh | 5 +++++
1 file changed, 5 insertions(+)

46
recipes-libreoffice/libreoffice/libreoffice-native/0006-Do-not-fetch-fonts-for-native-tools.patch
View File

@@ -1,46 +0,0 @@
From 2821815a425c4c944e1106f2790945fb09f0ee2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 19 Aug 2021 17:52:36 +0200
Subject: [PATCH] Do not fetch fonts for native tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
Makefile.fetch | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/Makefile.fetch b/Makefile.fetch
index 3c5b7ed..f76b304 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -171,25 +171,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
$(call fetch_Optional,ZXING,ZXING_TARBALL) \
$(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_CARLITO_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_DEJAVU_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_GENTIUM_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_SOURCESERIF_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
- $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call fetch_Optional,MYTHES,MYTHES_TARBALL) \
--
2.31.1

4
recipes-libreoffice/libreoffice/libreoffice-native/0004-gengal-fix-path-to-redirectrc.patch → recipes-libreoffice/libreoffice/libreoffice-native/0006-gengal-fix-path-to-redirectrc.patch
View File

@@ -1,5 +1,5 @@
From 0840b6904d48399818f17487caf593bc2e9727bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 20 Jan 2016 23:16:10 +0100
Subject: [PATCH] gengal: fix path to redirectrc
MIME-Version: 1.0
@@ -7,7 +7,7 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I4a221b828a2ac9b8fd585d34f8e5197bf40c6498
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
svx/source/gengal/gengal.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

12
recipes-libreoffice/libreoffice/libreoffice-version.inc
View File

@@ -1,5 +1,9 @@
PV = "7.4.2.3"
DIRV = "7.4.2"
PV = "5.0.6.3"
DIRV = "5.0.6"
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
SRC_URI[sha256sum] = "82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a"
SRC_URI += " \
http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \
"
SRC_URI[md5sum] = "541d92329d433696c478f7669ac976f1"
SRC_URI[sha256sum] = "4601d778318e6221cf5b44398c54a790169ad3afb4e81aa29766bcefac0fecc7"

180
recipes-libreoffice/libreoffice/libreoffice.bb
View File

@@ -1,8 +1,6 @@
require ${BPN}.inc
inherit gobject-introspection bash-completion gtk-icon-cache mime mime-xdg
MIME_XDG_PACKAGES = "${PN}"
inherit gtk-icon-cache pythonnative
SRC_URI += " \
http://download.documentfoundation.org/libreoffice/src/${DIRV}/${BPN}-translations-${PV}.tar.xz;name=translations \
@@ -11,15 +9,14 @@ SRC_URI += " \
file://0003-remove-paths-for-gb_Executable_get_command.patch \
file://0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch \
file://0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch \
file://0006-Package.mk-workaround-icu-missing-error-for-without-.patch \
file://0007-configure.ac-avoid-finding-calling-pg_config.patch \
file://0008-avoid-downloading-by-git-submodules.patch \
file://0009-Use-wrappers-for-gobject-introspection.patch \
file://0010-Support-install-to-find-bash-completion.in.patch \
file://0011-Skip-isystem-check.patch \
file://0006-make-sure-that-gengal-uses-native-libraries.patch \
file://0007-Package.mk-workaround-icu-missing-error-for-without-.patch \
file://0008-configure.ac-avoid-finding-calling-pg_config.patch \
file://0009-avoid-downloading-by-git-submodules.patch \
"
SRC_URI[translations.sha256sum] = "c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1"
SRC_URI[translations.md5sum] = "644f33f2bc84fe9ffd8a4c09b41a36fc"
SRC_URI[translations.sha256sum] = "0c79245cbab70e4f785dd226888ee1c3e8d359f73b345a90eebd8d1bd23c2947"
DEPENDS += " \
${BPN}-native \
@@ -27,12 +24,16 @@ DEPENDS += " \
curl \
icu \
expat \
poppler \
harfbuzz \
openldap \
nss \
zlib \
jpeg \
neon \
libpng \
apr \
serf \
libatomic-ops \
lcms \
harfbuzz \
@@ -41,8 +42,8 @@ DEPENDS += " \
openssl \
cups \
gstreamer1.0-plugins-base \
tiff \
\
mdds \
glm \
redland \
libabw \
@@ -51,6 +52,7 @@ DEPENDS += " \
libwpd \
libcdr \
librevenge \
libcmis \
libfreehand \
libe-book \
libmwaw \
@@ -62,14 +64,12 @@ DEPENDS += " \
libgltf \
libexttextcat \
clucene-core \
vigra \
hunspell \
mythes \
hyphen \
graphite2 \
liblangtag \
lpsolve \
gpgme \
mdds-2.0 \
"
# necessary to let the call for python-config succeed
@@ -81,38 +81,58 @@ export STAGING_INCDIR
# Notes:
#
# 1. By default many many sources are downloaded from libreoffice mirrors.
# This can be avoided by --with-system-.. To see what's still loaded check
# log.do_compile.
# 2. in case of trouble in do_compile: configure with --enable-verbose might
# help detecting culprit
# 3. --enable-scripting-javascript / rhino meta-java
# 4. Libreoffice Base embedded db / hsqldb meta-java
# This can be avoided by --with-system-.. To see what's still loaded check
# log.do_compile.
#
# 2. problems during configure detected for (TBD?)
# * boost: 'configure: error: Could not find a version of the library!'
#
# 3. in case of trouble in do_compile: configure with --enable-verbose might
# help detecting culprit
#
# 5. --enable-scripting-javascript / rhino meta-java
# 6. Libreoffice Base embedded db / hsqldb meta-java
# 7. galleries fail to build / prebuild from external sources?
EXTRA_OECONF += " \
--without-java \
--with-lang=ALL \
\
--disable-collada \
--disable-coinmp \
--enable-python=system \
--with-tls=nss \
--without-galleries \
\
--with-system-poppler \
--with-system-openldap \
--with-system-zlib \
--with-system-jpeg \
--with-system-neon \
--with-system-libpng \
--with-system-nss \
--with-system-apr \
--with-system-serf \
--with-system-libatomic_ops \
--with-system-lcms2 \
--with-system-libxml \
--with-system-icu \
--with-system-expat \
--with-system-curl \
--with-system-harfbuzz \
--with-system-glew \
--with-system-openssl \
\
--with-system-cppunit \
--with-system-glm \
--with-system-mdds \
--with-system-redland \
--with-system-libabw \
--with-system-libwps \
--with-system-libwpg \
--with-system-libwpd \
--with-system-libcdr \
--with-system-librevenge \
--with-system-libfreehand \
--with-system-libcmis \
--with-system-libebook \
--with-system-libmwaw \
--with-system-libetonyek \
@@ -120,27 +140,29 @@ EXTRA_OECONF += " \
--with-system-libmspub \
--with-system-libpagemaker \
--with-system-libodfgen \
--with-system-libgltf \
--with-system-libexttextcat \
--with-system-clucene \
--with-system-vigra \
--with-system-hunspell \
--with-system-mythes \
--with-system-altlinuxhyph \
--with-system-gpgmepp \
--with-system-libtiff \
\
--with-external-dict-dir=${datadir}/hunspell \
--with-system-dicts \
--with-system-graphite \
--with-system-liblangtag \
"
PACKAGECONFIG ??= " \
gtk3 \
gtk \
mariadb \
postgresql \
"
PACKAGECONFIG[gtk] = "--enable-gtk , --disable-gtk, gtk+ cairo"
PACKAGECONFIG[gtk3] = "--enable-gtk3 , --disable-gtk3, gtk+3 cairo"
PACKAGECONFIG[avahi] = "--enable-avahi, --disable-avahi, avahi"
PACKAGECONFIG[odk] = "--enable-odk, --disable-odk"
PACKAGECONFIG[mariadb] = "--with-system-mariadb, , mariadb"
PACKAGECONFIG[mariadb] = "--enable-ext-mariadb-connector --enable-bundle-mariadb --with-system-mariadb, --disable-ext-mariadb-connector --disable-bundle-mariadb, mariadb"
PACKAGECONFIG[postgresql] = "--enable-postgresql-sdbc --with-system-postgresql, --disable-postgresql-sdbc, postgresql"
do_configure() {
@@ -150,8 +172,8 @@ do_configure() {
gnu-configize
autoconf
cd $olddir
export PYTHON_CFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}
export PYTHON_LIBS="-L${STAGING_LIBDIR} -lpython${PYTHON_BASEVERSION}${PYTHON_ABI}"
export PYTHON_CFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}
export PYTHON_LIBS="-L${STAGING_LIBDIR} -lpython${PYTHON_BASEVERSION}"
oe_runconf
mkdir -p ${B}/workdir/Executable
@@ -167,61 +189,47 @@ do_configure() {
# ensure gengal loads native libraries
sed -i 's:%STAGING_LIBDIR_NATIVE%:${STAGING_LIBDIR_NATIVE}:g' ${S}/solenv/gbuild/Gallery.mk
# adjust gpgme++ path
sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk
}
do_compile:prepend() {
# INTROSPECTION_SCANNER is exprted but INTROSPECTION_COMPILER is not. This
# caused 'Permission denied' errors. So give a little help:
export INTROSPECTION_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper
}
do_install() {
make DESTDIR=${D} distro-pack-install
# install LibreOfficeKit (gobject-introspection) manually - became necessary since 6.4.x
install -m 0755 -d ${D}${libdir}/girepository-1.0
install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.typelib ${D}${libdir}/girepository-1.0/
install -m 0755 -d ${D}${libdir}/gir-1.0
install -m 0644 ${B}/workdir/CustomTarget/sysui/share/libreoffice/LOKDocView-0.1.gir ${D}${libdir}/gir-1.0/
install -m 0755 ${B}/instdir/program/liblibreofficekitgtk.so ${D}${libdir}/
# install LibreOfficeKit headers
install -m 0755 -d ${D}${includedir}/LibreOfficeKit
install -m 0644 ${S}/include/LibreOfficeKit/* ${D}${includedir}/LibreOfficeKit/
# unoconv
install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/git/unoconv/unoconv ${D}/${bindir}
# remove some unneeded files
rm -rf ${D}${libdir}/libreoffice/readmes
rm -rf ${D}${libdir}/libreoffice/share/theme_definitions/ios
rmdir ${D}${libdir}/libreoffice/share/theme_definitions
}
FILES:${PN} += " \
${datadir}/icons \
${datadir}/metainfo \
FILES_${PN} += " \
${datadir}/mime \
${datadir}/application-registry \
${datadir}/mimelnk \
${datadir}/icons \
${datadir}/appdata \
${datadir}/mime-info \
${datadir}/mime/packages \
\
"
PACKAGES =+ "${PN}-odk ${PN}-officekit"
PACKAGE_BEFORE_PN += "${PN}-odk"
FILES_${PN}-odk = " \
${libdir}/libreoffice/sdk \
"
INSANE_SKIP_${PN}-odk += "dev-so staticdev"
FILES:${PN}-odk = "${libdir}/libreoffice/sdk"
INSANE_SKIP:${PN}-odk += "dev-so staticdev"
FILES:${PN}-officekit = " \
${libdir}/girepository-1.0 \
${libdir}/liblibreofficekitgtk.so \
FILES_${PN}-dbg += " \
${libdir}/libreoffice/*/.debug \
${libdir}/libreoffice/*/*/.debug \
${libdir}/libreoffice/*/*/*/.debug \
"
# based http://pkgs.fedoraproject.org/cgit/rpms/libreoffice.git/tree/libreoffice.spec
LO_LANGUAGE_FILES = " \
${libdir}/libreoffice/share/autocorr/*%{1}.dat \
${libdir}/libreoffice/program/resource/*%{1}/LC_MESSAGES \
${libdir}/libreoffice/program/resource/*%{1}.res \
${libdir}/libreoffice/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \
${libdir}/libreoffice/share/config/soffice.cfg/*/ui/res/%{1}.zip \
${libdir}/libreoffice/share/template/%{1} \
${libdir}/libreoffice/share/registry/Langpack-%{1}.xcd \
${libdir}/libreoffice/share/registry/res/registry_%{1}.xcd \
${libdir}/libreoffice/share/registry/res/fcfg_langpack_%{1}.xcd \
@@ -230,15 +238,15 @@ LO_LANGUAGE_FILES = " \
python lo_do_split_locales() {
import glob, subprocess
packages = (d.getVar('PACKAGES') or "").split()
packages = (d.getVar('PACKAGES', True) or "").split()
datadir = d.getVar('datadir')
datadir = d.getVar('datadir', True)
if not datadir:
bb.note("datadir not defined")
return
dvar = d.getVar('PKGD')
pn = d.getVar('LOCALEBASEPN')
dvar = d.getVar('PKGD', True)
pn = d.getVar('LOCALEBASEPN', True)
if pn + '-locale' in packages:
packages.remove(pn + '-locale')
@@ -246,9 +254,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'))
transpaths = glob.glob('%s/translations/source/*' % d.getVar('S', True))
for l in transpaths:
locale = l.replace('%s/translations/source/' % d.getVar('S'), '')
locale = l.replace('%s/translations/source/' % d.getVar('S', True), '')
if not locale in locales:
locales.append(locale)
@@ -262,7 +270,7 @@ python lo_do_split_locales() {
# check for files matching at each location / language
langfiles = dict()
for transvar in d.getVar('LO_LANGUAGE_FILES').split():
for transvar in d.getVar('LO_LANGUAGE_FILES', True).split():
filesfound = 0
for locale in sorted(locales):
pattern = transvar.replace('%{1}', locale)
@@ -280,31 +288,29 @@ 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'), transvar))
bb.warn('%s language file pattern not found: %s' % (d.getVar('PN', True), transvar))
# setup packages for locales with files found
summary = d.getVar('SUMMARY') or pn
description = d.getVar('DESCRIPTION') or ""
locale_section = d.getVar('LOCALE_SECTION')
mlprefix = d.getVar('MLPREFIX') or ""
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 ""
for locale in locales:
if locale in langfiles:
ln = legitimize_package_name(locale)
pkg = pn + '-locale-' + ln
packages.insert(0, pkg)
d.setVar('FILES:' + pkg, langfiles[locale] )
d.setVar('RRECOMMENDS:' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l))
d.setVar('DESCRIPTION:' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))
d.setVar('FILES_' + pkg, langfiles[locale] )
d.setVar('RRECOMMENDS_' + pkg, '%svirtual-locale-%s' % (mlprefix, ln))
d.setVar('RPROVIDES_' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln))
d.setVar('SUMMARY_' + pkg, '%s - %s translations' % (summary, l))
d.setVar('DESCRIPTION_' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l))
if locale_section:
d.setVar('SECTION:' + pkg, locale_section)
d.setVar('SECTION_' + pkg, locale_section)
d.setVar('PACKAGES', ' '.join(packages))
return
}
PACKAGESPLITFUNCS:prepend = "lo_do_split_locales "
RDEPENDS:${PN} = "hunspell-dictionaries"
PACKAGESPLITFUNCS_prepend = "lo_do_split_locales "

56
recipes-libreoffice/libreoffice/libreoffice.inc
View File

@@ -1,5 +1,5 @@
SUMMARY = "Libre office base"
LICENSE = "GPL-3.0-only & LGPL-3.0-only & MPL-1.1"
DESCRIPTION = "Libre office base"
LICENSE = "GPLv3 & LGPLv3 & MPLv1.1"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LGPL;md5=6a6a8e020838b23406c81b19c1d46df6 \
@@ -9,13 +9,16 @@ LIC_FILES_CHKSUM = " \
require libreoffice-version.inc
SRC_URI += " \
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv;branch=master;protocol=https \
file://0001-Workaround-boost-library-detection-failures.patch \
file://0002-Fix-build-with-icu-68.patch \
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
file://0001-update-ax_boost-scripts-to-fix-configure-with-system.patch \
file://0002-fix-gcc-build-error.patch \
file://0003-upgrade-to-ICU-58.patch \
file://0004-remove-dictmgr.hxx-to-be-compatible-with-later-hunsp.patch \
file://0005-packedpixeliterator.hxx-fix-typo-detected-by-gcc7.patch \
"
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
inherit autotools pkgconfig python3native setuptools3-base perlnative
inherit autotools-brokensep pkgconfig distutils-base perlnative
DEPENDS += " \
python3-lxml-native \
@@ -29,39 +32,12 @@ DEPENDS += " \
EXTRA_OECONF = " \
--without-doxygen \
--enable-release-build \
--enable-python=system \
--disable-skia \
${@oe.utils.parallel_make_argument(d, '--with-parallelism=%d')} \
--disable-verbose \
--with-parallelism=${@oe.utils.cpu_count()} \
\
--with-system-boost \
--with-boost-date-time=boost_date_time \
--with-boost-filesystem=boost_filesystem \
--with-boost-locale=boost_locale\
--with-boost-iostreams=boost_iostreams\
--with-boost-system=boost_system\
\
--with-system-cairo \
--with-system-epoxy \
--with-system-curl \
--with-system-libpng \
--with-system-jpeg \
--with-system-libxml \
--with-system-graphite \
--with-system-harfbuzz \
--with-system-icu \
--with-system-expat \
--with-system-lcms2 \
--with-system-nss \
--with-system-cppunit \
--with-system-hunspell \
--with-system-mythes \
--with-system-clucene \
--with-system-glm \
--with-system-altlinuxhyph \
--with-system-liblangtag \
--with-system-zlib \
--with-system-lpsolve \
--with-system-mdds \
--with-system-librevenge \
--with-system-libabw \
--with-system-libcdr \
--with-system-libebook \
--with-system-libfreehand \
"
do_compile[network] = "1"

33
recipes-libreoffice/libreoffice/libreoffice/0001-configure.ac-skip-some-cross-compile-sections-they-d.patch
View File

@@ -1,33 +1,42 @@
From a2df22788f500ceba2574af12201f6f4286713df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 22:10:36 +0200
From 8407698e81ad907287a87bbc561544c0a84ae3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 21 Oct 2015 23:27:01 +0200
Subject: [PATCH] configure.ac: skip some cross-compile sections - they do not
work for oe-environment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 955aea1..f310c00 100644
index 50003a6..02d1cc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4487,7 +4487,7 @@ dnl ===================================================================
@@ -4570,7 +4570,7 @@ dnl machine when doing cross-compilation
dnl ===================================================================
m4_pattern_allow([PKG_CONFIG_FOR_BUILD])
m4_pattern_allow([PKG_CONFIG_LIBDIR])
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" = "yesfoo"; then
AC_MSG_CHECKING([for BUILD platform configuration])
echo
rm -rf CONF-FOR-BUILD config_build.mk
@@ -9684,7 +9684,7 @@ if test $enable_python = system; then
@@ -7749,7 +7749,7 @@ fi
dnl ===================================================================
dnl Check for system cppunit
dnl ===================================================================
-if test "$cross_compiling" != "yes"; then
+if test "$cross_compiling" != "yesfoo"; then
libo_CHECK_SYSTEM_MODULE([cppunit],[CPPUNIT],[cppunit >= 1.12.0])
fi
@@ -8014,7 +8014,7 @@ if test $enable_python = system; then
# Fallback: Accept these in the environment, or as set above
# for MacOSX.
:
@@ -37,5 +46,5 @@ index 955aea1..f310c00 100644
# we actually do check anew.
unset PYTHON am_cv_pathless_PYTHON ac_cv_path_PYTHON am_cv_python_version am_cv_python_platform am_cv_python_pythondir am_cv_python_pyexecdir
--
2.21.0
2.1.0

28
recipes-libreoffice/libreoffice/libreoffice/0002-Makefile.in-avoid-building-target-cross-toolset.patch
View File

@@ -1,31 +1,31 @@
From d31a93121791963d75f6572ac2b393371d72ece0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 22:20:06 +0200
From 231a054d94ee9eced6e116829d5a9f7706d7bb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Tue, 27 Oct 2015 01:16:47 +0100
Subject: [PATCH] Makefile.in: avoid building target cross-toolset
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe-specific]
Upstream-Status: Inappropriate [cross compiling specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index f9a2644..c1a8f53 100644
index 61b16ab..37405f2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -283,7 +283,7 @@ bootstrap: check-if-root compilerplugins
@@ -242,7 +242,7 @@ bootstrap: compilerplugins
# Note: this will pipe through all gbuild targets to ... gbuild
# with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
# with some translations like "build"->"all" for historic reasons
#
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \
+build: bootstrap fetch \
$(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check)))
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
ifeq ($(OS),iOS)
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset)
+build: bootstrap fetch
ifneq ($(filter-out WNT MACOSX IOS,$(OS)),)
mkdir -p $(INSTDIR)
$(SRCDIR)/solenv/bin/install-gdb-printers -a $(INSTDIR) -c
--
2.31.1
2.1.0

6
recipes-libreoffice/libreoffice/libreoffice/0003-remove-paths-for-gb_Executable_get_command.patch
View File

@@ -1,5 +1,5 @@
From 502ff5208fc4326960b9d1e9f25642046dc64a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 21 Nov 2015 23:56:19 +0100
Subject: [PATCH] remove paths for gb_Executable_get_command
MIME-Version: 1.0
@@ -10,7 +10,7 @@ use binaries found in our native sysroot
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
solenv/gbuild/TargetLocations.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -19,7 +19,7 @@ diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 82857a9..0aa2cbd 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -381,7 +381,7 @@ endef
@@ -355,7 +355,7 @@ endef
#
# gb_Executable_get_command executable
define gb_Executable_get_command

27
recipes-libreoffice/libreoffice/libreoffice/0004-ensure-that-native-gendict-build-by-libreoffice-is-u.patch
View File

@@ -1,40 +1,43 @@
From 900b79ed77cd5c126cc4ac9beef488a94ef57b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Oct 2020 14:05:48 +0200
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Fri, 20 Nov 2015 22:03:58 +0100
Subject: [PATCH] ensure that native gendict build by libreoffice is used
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is neccessary since last commit using all helpers from native sysroot
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Change-Id: I0afbd760bc8810396e04a5e276a68a810042b057
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
i18npool/CustomTarget_breakiterator.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index dee46a3..fab7ddf 100644
index 4aaf2e5..5837bc8 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -23,7 +23,7 @@ $(i18npool_BIDIR)/dict_%.data : \
@@ -22,7 +22,7 @@ $(i18npool_BIDIR)/dict_%.data : \
| $(i18npool_BIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
else
else # !iOS ANDROID
@@ -38,7 +38,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
@@ -34,7 +34,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
| $(i18npool_BIDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
$(call gb_Helper_abbreviate_dirs,\
- $(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
+ $(call gb_Helper_execute,gendict_libre) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),DIC)
endif
--
2.26.2
2.1.0

40
recipes-libreoffice/libreoffice/libreoffice/0005-add-a-new-gb_Rdb_get_target_for_build_native-and-use.patch
View File

@@ -1,45 +1,47 @@
From 39afebf39613d0788a205ff6694e64085e7f5899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 22:28:59 +0200
From cf939a0c4e49d34f5bd795dbbbd1a7ae396ce622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 6 Dec 2015 22:23:17 +0100
Subject: [PATCH] add a new gb_Rdb_get_target_for_build_native and use it
i18npool/CustomTarget_localedata
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe-specific]
We need to use native saxparser
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Upstream-Status: Inappropriate [cross specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
i18npool/CustomTarget_localedata.mk | 2 +-
solenv/gbuild/TargetLocations.mk | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 3ce723b..0c41954 100644
index 481b3ee..28cd67c 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -24,7 +24,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_%_new.cxx : \
$(call gb_Helper_print_on_error, \
$(call gb_Helper_execute,saxparser) $* $< $@.sax \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
- -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser))) && \
+ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser))) && \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.sax > $@)
rm $@.sax
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SAX)
@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
$$(call gb_Helper_abbreviate_dirs, \
$$(call gb_Helper_execute,saxparser) $(1) $$< $$@.tmp \
-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER)) \
- -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,saxparser)) \
+ -env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build_native,saxparser)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
rm $$@.tmp)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e7ced59..5277a81 100644
index 82857a9..d1c2e92 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -175,6 +175,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
@@ -138,6 +138,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb
+gb_Rdb_get_target_for_build_native = %STAGING_LIBDIR_NATIVE%/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
gb_MoTarget_get_target = $(WORKDIR)/MoTarget/$(1).mo
gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
--
2.35.3
2.5.0

31
recipes-libreoffice/libreoffice/libreoffice/0006-Package.mk-workaround-icu-missing-error-for-without-.patch
View File

@@ -1,31 +0,0 @@
From e3ab0c8f837571765af845f409e058afe0a84921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 22:45:49 +0200
Subject: [PATCH] Package.mk: workaround icu missing error for
--without-galleries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
solenv/gbuild/Package.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 9c90322..7406f46 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -80,7 +80,6 @@ $(call gb_Package_get_preparation_target,%) :
$(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
$(call gb_Trace_StartRange,$*,PKG)
- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,$(RDEPENDS) depend(s) on package $* which does not exist.))
rm -f $@ && \
mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@
$(call gb_Trace_EndRange,$*,PKG)
--
2.35.3

33
recipes-libreoffice/libreoffice/libreoffice/0006-make-sure-that-gengal-uses-native-libraries.patch Normal file
View File

@@ -0,0 +1,33 @@
From 8f21c644930042bca1725b9547f4a4585fe79784 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 9 Dec 2015 23:20:14 +0100
Subject: [PATCH] make sure that gengal uses native libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
solenv/gbuild/Gallery.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 2ce708d..44d1bf4 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -23,8 +23,8 @@ define gb_Gallery__make_env_args
$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
"-env:UNO_TYPES=$(foreach item,offapi udkapi,\
$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
--env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
+-env:URE_INTERNAL_LIB_DIR=%STAGING_LIBDIR_NATIVE% \
+-env:LO_LIB_DIR=%STAGING_LIBDIR_NATIVE%
endef
define gb_Gallery__command
--
2.5.0

29
recipes-libreoffice/libreoffice/libreoffice/0007-Package.mk-workaround-icu-missing-error-for-without-.patch Normal file
View File

@@ -0,0 +1,29 @@
From d194f5aef8bf1c16097729d448b34316d621e557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 24 Jan 2016 16:55:11 +0100
Subject: [PATCH] Package.mk: workaround icu missing error for
--without-galleries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
solenv/gbuild/Package.mk | 1 -
1 file changed, 1 deletion(-)
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 5cbe70c..2cb4e38 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -79,7 +79,6 @@ $(call gb_Package_get_preparation_target,%) :
# Package_foo makefiles.
$(call gb_Package_get_target,%) :
$(call gb_Output_announce,$*,$(true),PKG,2)
- $(if $(PACAKGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
rm -f $@ && \
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
--
2.5.0

47
recipes-libreoffice/libreoffice/libreoffice/0007-configure.ac-avoid-finding-calling-pg_config.patch
View File

@@ -1,47 +0,0 @@
From 7b4896cb093d1836a1a13f3f0a8b447c1a0465d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 3 Aug 2019 22:53:02 +0200
Subject: [PATCH] configure.ac: avoid finding/calling pg_config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index f310c00..2573cc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10048,18 +10048,12 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
pg_supp_path="$P_SEP$d$pg_supp_path"
done
fi
- AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
- if test -n "$PGCONFIG"; then
- POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
- POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
- else
- PKG_CHECK_MODULES(POSTGRESQL, libpq, [
- POSTGRESQL_INC=$POSTGRESQL_CFLAGS
- POSTGRESQL_LIB=$POSTGRESQL_LIBS
- ],[
- AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH])
- ])
- fi
+ PKG_CHECK_MODULES(POSTGRESQL, libpq, [
+ POSTGRESQL_INC=$POSTGRESQL_CFLAGS
+ POSTGRESQL_LIB=$POSTGRESQL_LIBS
+ ],[
+ AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH])
+ ])
FilterLibs "${POSTGRESQL_LIB}"
POSTGRESQL_LIB="${filteredlibs}"
else
--
2.21.0

37
recipes-libreoffice/libreoffice/libreoffice/0008-configure.ac-avoid-finding-calling-pg_config.patch Normal file
View File

@@ -0,0 +1,37 @@
From a3d541ac396929b6ab78fcd5d8e8ccc85a6b3a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Thu, 28 Jan 2016 00:49:41 +0100
Subject: [PATCH] configure.ac: avoid finding/calling pg_config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [cross compiling specific]
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6a0e646..f253a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8302,12 +8302,8 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
pg_supp_path="$P_SEP$d$pg_supp_path"
done
fi
- AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path)
- if test -z "$PGCONFIG"; then
- AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH])
- fi
- POSTGRESQL_INC=-I$(${PGCONFIG} --includedir)
- POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)"
+ POSTGRESQL_INC=
+ POSTGRESQL_LIB=
else
# if/when anything else than PostgreSQL uses Kerberos,
# move this out of `test "x$enable_postgresql_sdbc" != "xno"'
--
2.5.0

49
recipes-libreoffice/libreoffice/libreoffice/0009-Use-wrappers-for-gobject-introspection.patch
View File

@@ -1,49 +0,0 @@
From ed13bcd91383a5edcf2010953cf3287b8b26de9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 5 Aug 2019 21:37:07 +0200
Subject: [PATCH] Use wrappers for gobject-introspection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
With INTROSPECTION_COMPILER not set by configure it is:
Upstream-Status: Inappropriate [oe-specific]
Sun, 2 Feb 2020:
Adjusted for 6.4.0.3
Mon, 8 Feb 2021
Adjusted for 7.1.0.3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
sysui/CustomTarget_share.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 1f578f5..2a3aac5 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -167,7 +167,7 @@ ifneq ($(INTROSPECTION_SCANNER),)
$(share_WORKDIR)/%/LOKDocView-0.1.gir: \
$(call gb_Library_get_target,libreofficekitgtk)
mkdir -p $(dir $@)
- PYTHONWARNINGS=default g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
+ PYTHONWARNINGS=default ${INTROSPECTION_SCANNER} "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" \
"${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
`${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` \
-I"${SRCDIR}/include/" \
@@ -179,7 +179,7 @@ $(share_WORKDIR)/%/LOKDocView-0.1.gir: \
--output="$@" --warn-all --no-libtool
$(share_WORKDIR)/%/LOKDocView-0.1.typelib: $(share_WORKDIR)/%/LOKDocView-0.1.gir
- g-ir-compiler "$<" --output="$@"
+ ${INTROSPECTION_COMPILER} "$<" --output="$@"
endif
--
2.26.2

8
recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch → recipes-libreoffice/libreoffice/libreoffice/0009-avoid-downloading-by-git-submodules.patch
View File

@@ -1,5 +1,5 @@
From f52d4fea70f71b844b4ad757df61423e08366083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sun, 31 Jan 2016 21:10:32 +0100
Subject: [PATCH] avoid downloading by git submodules
MIME-Version: 1.0
@@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
configure.ac | 3 +++
1 file changed, 3 insertions(+)
@@ -17,7 +17,7 @@ diff --git a/configure.ac b/configure.ac
index 9df3182..ccae843 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13860,6 +13860,9 @@ if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
@@ -12312,6 +12312,9 @@ if test "$enable_release_build" = "" -o "$enable_release_build" = "no"; then
test "$WITH_LANG_LIST" = "en-US" || WITH_LANG_LIST=`echo $WITH_LANG_LIST qtz`
ALL_LANGS=`echo $ALL_LANGS qtz`
fi
@@ -25,8 +25,8 @@ index 9df3182..ccae843 100644
+GIT_NEEDED_SUBMODULES=
+
AC_SUBST(ALL_LANGS)
AC_DEFINE_UNQUOTED(WITH_LANG,"$WITH_LANG")
AC_SUBST(WITH_LANG)
AC_SUBST(WITH_LANG_LIST)
--
2.5.0

37
recipes-libreoffice/libreoffice/libreoffice/0010-Support-install-to-find-bash-completion.in.patch
View File

@@ -1,37 +0,0 @@
From 9869faf9f67c1bf53b47e20c89f186d7e222acc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 29 Feb 2020 19:05:07 +0100
Subject: [PATCH] Support install to find bash-completion.in
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
| Error: can't open bin/bash-completion.in for reading: [Errno 2] No such file or directory: 'bin/bash-completion.in'
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
bin/distro-install-desktop-integration | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 1da104e..42991f8 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -172,10 +172,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_
# create bash completion
mkdir -p $DESTDIR/usr/share/bash-completion/completions
-"${SRCDIR?}"/bin/generate-bash-completion.py bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
+"${SRCDIR?}"/bin/generate-bash-completion.py "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh
test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/$INSTALLDIRNAME.sh" >>$DESTDIR/gid_Module_Root_Brand
if test "$WITH_COMPAT_OOWRAPPERS" = "TRUE" ; then
- "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
+ "${SRCDIR?}"/bin/generate-bash-completion.py --compat-oowrappers "${SRCDIR?}"/bin/bash-completion.in $DESTDIR/usr/share/bash-completion/completions/ooffice.sh
test -f $DESTDIR/gid_Module_Root_Brand && echo "/usr/share/bash-completion/completions/ooffice.sh" >>$DESTDIR/gid_Module_Root_Brand
fi
--
2.21.0

53
recipes-libreoffice/libreoffice/libreoffice/0011-Skip-isystem-check.patch
View File

@@ -1,53 +0,0 @@
From ec1594b3a9f1959adab19a8f7d5f189510dd4a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 9 Feb 2022 23:55:25 +0100
Subject: [PATCH] Skip -isystem check
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It injects host path:
| ERROR: libreoffice-7.3.0.3-r0 do_configure: QA Issue: This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities.
| Rerun configure task after fixing this. [configure-unsafe]
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6ca795d..f1159a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3837,25 +3837,7 @@ fi
AC_SUBST(CROSS_COMPILING)
AC_SUBST(ENABLE_WASM_STRIP)
-# Use -isystem (gcc) if possible, to avoid warnings in 3rd party headers.
-# NOTE: must _not_ be used for bundled external libraries!
-ISYSTEM=
-if test "$GCC" = "yes"; then
- AC_MSG_CHECKING( for -isystem )
- save_CFLAGS=$CFLAGS
- CFLAGS="$CFLAGS -isystem /usr/include -Werror"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ ISYSTEM="-isystem " ],[])
- CFLAGS=$save_CFLAGS
- if test -n "$ISYSTEM"; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- fi
-fi
-if test -z "$ISYSTEM"; then
- # fall back to using -I
- ISYSTEM=-I
-fi
+ISYSTEM=-isystem
AC_SUBST(ISYSTEM)
dnl ===================================================================
--
2.34.1

10
recipes-support/clucene/clucene-core_2.3.3.4.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "CLucene is a indexing and searching API"
HOMEPAGE = "http://www.sourceforge.net/projects/clucene"
LICENSE = "LGPL-2.0-or-later & Apache-2.0"
LICENSE = "LGPLv2+ & Apache-2.0"
LIC_FILES_CHKSUM = " \
file://APACHE.license;md5=86d3f3a95c324c9479bd8986968f4327 \
file://LGPL.license;md5=464215a90afcdfbae965d89feb928c7e \
@@ -13,7 +13,6 @@ SRC_URI = " \
file://0003-align-pkg-config.patch \
file://0004-fix-location-s-for-our-cmake-config.patch \
file://0005-install-contribs-lib.patch \
file://0006-Fix-build-with-glibc-2.36.patch \
"
SRC_URI[md5sum] = "48d647fbd8ef8889e5a7f422c1bfda94"
SRC_URI[sha256sum] = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"
@@ -22,9 +21,8 @@ inherit cmake
DEPENDS = "boost zlib"
EXTRA_OECMAKE = " \
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-DENABLE_COMPILE_TESTS=OFF \
-DBUILD_CONTRIBS_LIB=ON"
EXTRA_OECMAKE = "-DENABLE_COMPILE_TESTS=OFF -DBUILD_CONTRIBS_LIB=ON"
FILES_${PN}-dev += "${libdir}/cmake"
BBCLASSEXTEND = "native"

28
recipes-support/clucene/files/0006-Fix-build-with-glibc-2.36.patch
View File

@@ -1,28 +0,0 @@
From 37dff3758407e74cc092008a8a2aeacc22c7e25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 21 Sep 2022 22:59:46 +0200
Subject: [PATCH] Fix build with glibc 2.36
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
src/core/CLucene/document/DateTools.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/core/CLucene/document/DateTools.cpp b/src/core/CLucene/document/DateTools.cpp
index f99ab25..46e6fa1 100644
--- a/src/core/CLucene/document/DateTools.cpp
+++ b/src/core/CLucene/document/DateTools.cpp
@@ -8,6 +8,7 @@
#include "DateTools.h"
#include "CLucene/util/Misc.h"
+#include <time.h>
CL_NS_USE(util)
CL_NS_DEF(document)
--
2.35.3

12
recipes-support/double-conversion/double-conversion.bb
View File

@@ -1,12 +0,0 @@
SUMMARY = "Efficient binary-decimal and decimal-binary conversion routines"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=1ea35644f0ec0d9767897115667e901f"
SRC_URI = "git://github.com/google/double-conversion.git;branch=master;protocol=https"
SRCREV = "af09fd65fcf24eee95dc62813ba9123414635428"
PV = "3.2.1"
S = "${WORKDIR}/git"
inherit cmake
EXTRA_OECMAKE += "-DBUILD_SHARED_LIBS=ON"

27
recipes-support/glm/glm_0.9.8.3.bb Normal file
View File

@@ -0,0 +1,27 @@
SUMMARY = "C++ mathematics library for graphics programming"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://copying.txt;md5=4431606d144252143c9c3df384a74cad"
inherit cmake
SRC_URI = "git://github.com/g-truc/glm.git"
# 0.9.8.3 tag
SRCREV = "6a1e2ec5d5e79e6d869c947cbdbcbb297bdf9d32"
S = "${WORKDIR}/git"
do_configure() {
# for some reason simple tailored configure runs best
mkdir -p ${B}
cd ${B}
# -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} causes configur break with
# | CMake Error: Could not open file for write in copy operation /usr/lib/cmake/glm/glmConfig.cmake.tmp
# | CMake Error: : System Error: No such file or directory
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
${OECMAKE_SOURCEPATH}
}
FILES_${PN}-dev += "${libdir}/cmake"
BBCLASSEXTEND = "native"

17
recipes-support/graphite2/graphite2.bb
View File

@@ -1,17 +0,0 @@
SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=b0452d508cc4eb104de0226a5b0c8786"
inherit cmake
DEPENDS += "freetype"
SRC_URI = "git://github.com/silnrsi/graphite.git;branch=master;protocol=https"
SRCREV = "92f59dcc52f73ce747f1cdc831579ed2546884aa"
PV = "1.3.14"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
BBCLASSEXTEND = "native"

12
recipes-support/graphite2/graphite2_1.3.5.bb Normal file
View File

@@ -0,0 +1,12 @@
SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=acba2ba259d936c324b90ab679e6b901"
inherit cmake
DEPENDS += "freetype"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/silgraphite/${BPN}/${BPN}-${PV}.tgz"
SRC_URI[md5sum] = "5b8d22a8bbf031838e31432868c0109c"
SRC_URI[sha256sum] = "f4712626eda0a1804367133460770560b545bbe75b1c4aab480c9b8e4e1c64bd"

31
recipes-support/gtkmathview/gtkmathview/0001-Fix-formatting-for-modern-c-11-compilers.patch
View File

@@ -1,31 +0,0 @@
From 90411a7f5e0e9582e79f0a8ccc1e2f158615e451 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 19 May 2018 23:18:11 -0700
Subject: [PATCH] Fix formatting for modern c++11 compilers
Fixes
error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/backend/svg/SVG_RenderingContext.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/backend/svg/SVG_RenderingContext.cc b/src/backend/svg/SVG_RenderingContext.cc
index 55d6097..0d50702 100644
--- a/src/backend/svg/SVG_RenderingContext.cc
+++ b/src/backend/svg/SVG_RenderingContext.cc
@@ -68,7 +68,7 @@ void
SVG_RenderingContext::documentStart(const BoundingBox& bbox)
{
beginDocument(bbox);
- metadata("Created by "PACKAGE" version "VERSION);
+ metadata("Created by " PACKAGE " version " VERSION);
}
void
--
2.17.0

28
recipes-support/gtkmathview/gtkmathview/0001-include-cstdio-to-get-printf-definitions.patch
View File

@@ -1,28 +0,0 @@
From c92890c5e18bb6ee23bdb14074bacf306dd9428f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 5 May 2015 20:35:01 -0700
Subject: [PATCH] include cstdio to get printf definitions
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/engine/boxml/BoxMLHOVElement.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/engine/boxml/BoxMLHOVElement.cc b/src/engine/boxml/BoxMLHOVElement.cc
index 1a2812c..96c9eea 100644
--- a/src/engine/boxml/BoxMLHOVElement.cc
+++ b/src/engine/boxml/BoxMLHOVElement.cc
@@ -21,7 +21,7 @@
// <http://www.gnu.org/licenses/>.
#include <config.h>
-
+#include <cstdio>
#include "BoxMLAttributeSignatures.hh"
#include "BoxMLHOVElement.hh"
#include "BoxMLHElement.hh"
--
2.1.4

63
recipes-support/gtkmathview/gtkmathview/0002-configure.ac-header-detection-of-hash_map-is-broken-.patch
View File

@@ -1,63 +0,0 @@
From 9c226fbc6a42540cb492fcfcb81ff16fffb086d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Tue, 30 Aug 2016 23:24:53 +0200
Subject: [PATCH] configure.ac: header detection of hash_map is broken - pin to
correct implementation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 31 ++++---------------------------
1 file changed, 4 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4f2118e..16c09d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,35 +252,12 @@ AC_SUBST(GTKMATHVIEW_SIZEOF_WCHAR_T, "$ac_cv_sizeof_wchar_t")
AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS(unordered_map,
- [
- AC_DEFINE(GMV_HAVE_UNORDERED_MAP,1,[Define if <unordered_map> is provided])
- GMV_HAVE_UNORDERED_MAP_CFLAGS=-DGMV_HAVE_UNORDERED_MAP=1
- ],
- [
- GMV_HAVE_UNORDERED_MAP_CFLAGS=
- ]
-)
+GMV_HAVE_UNORDERED_MAP_CFLAGS=
AC_SUBST(GMV_HAVE_UNORDERED_MAP_CFLAGS)
-AC_CHECK_HEADERS(hash_map,
- [
- AC_DEFINE(GMV_HAVE_HASH_MAP,1,[Define if <hash_map> is provided])
- GMV_HAVE_HASH_MAP_CFLAGS=-DGMV_HAVE_HASH_MAP=1
- ],
- [
- GMV_HAVE_HASH_MAP_CFLAGS=
- ]
-)
+GMV_HAVE_HASH_MAP_CFLAGS=
AC_SUBST(GMV_HAVE_HASH_MAP_CFLAGS)
-AC_CHECK_HEADERS(ext/hash_map,
- [
- AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
- GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
- ],
- [
- GMV_HAVE_EXT_HASH_MAP_CFLAGS=
- ]
-)
+AC_DEFINE(GMV_HAVE_EXT_HASH_MAP,1,[Define if <ext/hash_map> is provided])
+GMV_HAVE_EXT_HASH_MAP_CFLAGS=-DGMV_HAVE_EXT_HASH_MAP=1
AC_SUBST(GMV_HAVE_EXT_HASH_MAP_CFLAGS)
AC_MSG_CHECKING([whether the C++ compiler supports the standard character traits])
--
2.5.5

93
recipes-support/gtkmathview/gtkmathview/0003-gcc-6.0-build-fixes.patch
View File

@@ -1,93 +0,0 @@
From: Gert Wollny <gw.fossdev@gmail.com>
Date: Sun, 26 Jun 2016 13:25:00 +0200
Description: gcc 6.0 build fixes
Bug: https://bugs.debian.org/811682
Slightly adapted to our environment
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
--- a/src/engine/common/View.cc
+++ b/src/engine/common/View.cc
@@ -291,7 +291,7 @@
}
}
- return false;
+ return SmartPtr<Element>();
}
bool
--- a/src/backend/common/tfm/TFM.hh
+++ b/src/backend/common/tfm/TFM.hh
@@ -37,7 +37,7 @@
unsigned char face;
const char* codingScheme;
int designSize;
- int checksum;
+ unsigned int checksum;
unsigned int nDimensions;
unsigned int nCharacters;
};
@@ -52,7 +52,7 @@
struct Kerning
{
UChar8 index;
- int value;
+ unsigned int value;
};
struct Ligature
@@ -67,7 +67,7 @@
UChar8 index;
int width;
int height;
- int depth;
+ unsigned int depth;
int italicCorrection;
unsigned char nKernings;
const Kerning* kerning;
--- a/src/backend/common/StandardSymbolsShaper.hh
+++ b/src/backend/common/StandardSymbolsShaper.hh
@@ -32,20 +32,20 @@
struct HStretchyChar
{
Char16 ch;
- Char8 normal;
- Char8 left;
- Char8 glue;
- Char8 right;
+ UChar8 normal;
+ UChar8 left;
+ UChar8 glue;
+ UChar8 right;
};
struct VStretchyChar
{
Char16 ch;
- Char8 normal;
- Char8 top;
- Char8 glue;
- Char8 middle;
- Char8 bottom;
+ UChar8 normal;
+ UChar8 top;
+ UChar8 glue;
+ UChar8 middle;
+ UChar8 bottom;
};
protected:
--- a/src/backend/common/StandardSymbolsShaper.cc
+++ b/src/backend/common/StandardSymbolsShaper.cc
@@ -29,7 +29,7 @@
#include "ShapingContext.hh"
struct GlyphMap {
- Char8 index;
+ UChar8 index;
Char16 ch;
};

18
recipes-support/gtkmathview/gtkmathview/use_hostcxx.patch
View File

@@ -1,18 +0,0 @@
Use build_cc to compile the programs to run on build host
helps with cross compiling
Upstream-Status: Inappropriate [Cross-compiled OE specific]
diff --git a/src/common/mathvariants/Makefile.am b/src/common/mathvariants/Makefile.am
index 636ccf0..ed9921d 100644
--- a/src/common/mathvariants/Makefile.am
+++ b/src/common/mathvariants/Makefile.am
@@ -52,7 +52,7 @@ XSLTPROC = xsltproc
%.cc : %_gen.cc $(srcdir)/variant.top $(srcdir)/variant.bot
cat $(srcdir)/variant.top >$@
$(XSLTPROC) --novalid --param temp "false()" $(srcdir)/extract.xsl $(<:%_gen.cc=$(srcdir)/xml/%.xml) >>$@
- $(CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
+ $(BUILD_CXX) -o $(@:%.cc=%) -I$(top_builddir)/auto $<
echo "Char32 " >>$@
basename map_variant_$@ .cc | tr "-" "_" >>$@
echo "(Char32 ch)" >>$@

28
recipes-support/gtkmathview/gtkmathview_0.8.0.bb
View File

@@ -1,28 +0,0 @@
HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
LICENSE = "LGPL-3.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
PR = "r3"
PV = "0.8.0+git${SRCPV}"
SRC_URI = " \
git://github.com/GNOME/gtkmathview.git;branch=master;protocol=https \
file://use_hostcxx.patch \
file://0001-include-cstdio-to-get-printf-definitions.patch \
file://0002-configure.ac-header-detection-of-hash_map-is-broken-.patch \
file://0003-gcc-6.0-build-fixes.patch \
file://0001-Fix-formatting-for-modern-c-11-compilers.patch \
"
SRCREV = "0bc2cfa0a47aed2c8a63abd989cb8da4dcceb2ec"
S = "${WORKDIR}/git"
inherit features_check autotools pkgconfig
REQUIRED_DISTRO_FEATURES = "x11"
do_configure:append() {
# avoid host polution inf pkg-config files
sed -i "s:${STAGING_DIR_HOST}::g" `find -name '*.pc'`
}

4
recipes-support/hyphen/hyphen_2.8.8.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "A text hyphenation library"
HOMEPAGE = "http://hunspell.sourceforge.net/"
LICENSE = "LGPL-2.1-only | GPL-2.0-only | MPL-1.1"
LICENSE = "LGPLv2.1 | GPLv2 | MPLv1.1"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=d45e3467790c1cae990cc9ca3293bc97 \
file://COPYING.LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \
@@ -13,6 +13,6 @@ SRC_URI[sha256sum] = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff2
inherit autotools pkgconfig
RDEPENDS:${PN} = "perl"
RDEPENDS_${PN} = "perl"
BBCLASSEXTEND = "native"

250
recipes-support/libcmis/files/0002-drop-prefix.patch Normal file
View File

@@ -0,0 +1,250 @@
From 8b401fdea3f621101876f31f21aa98ffd60f5e91 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 16 May 2017 10:02:19 +0200
Subject: [PATCH 1/3] drop :: prefix
---
src/cmis-client.cxx | 2 +-
src/libcmis/atom-object.cxx | 2 +-
src/libcmis/document.hxx | 2 +-
src/libcmis/folder.hxx | 8 ++++----
src/libcmis/gdrive-folder.cxx | 2 +-
src/libcmis/json-utils.cxx | 2 +-
src/libcmis/oauth2-data.hxx | 2 +-
src/libcmis/object-type.hxx | 2 +-
src/libcmis/object.hxx | 2 +-
src/libcmis/property-type.hxx | 2 +-
src/libcmis/property.hxx | 2 +-
src/libcmis/rendition.hxx | 2 +-
src/libcmis/repository.hxx | 2 +-
src/libcmis/session-factory.hxx | 4 ++--
src/libcmis/xml-utils.cxx | 2 +-
15 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/cmis-client.cxx b/src/cmis-client.cxx
index 73c1b8e..d5c01e4 100644
--- a/src/cmis-client.cxx
+++ b/src/cmis-client.cxx
@@ -40,7 +40,7 @@
#include <libcmis/libcmis.hxx>
using namespace std;
-using namespace ::boost::program_options;
+using namespace boost::program_options;
using libcmis::PropertyPtrMap;
namespace
diff --git a/src/libcmis/atom-object.cxx b/src/libcmis/atom-object.cxx
index 1eb33fa..01454a4 100644
--- a/src/libcmis/atom-object.cxx
+++ b/src/libcmis/atom-object.cxx
@@ -59,7 +59,7 @@ namespace
// Some implementations (xcmis) put extra spaces into the type attribute
// (e.g. "application/atom+xml; type=feed" instead of "application/atom+xml;type=feed")
string linkType = link.getType( );
- linkType.erase( remove_if( linkType.begin(), linkType.end(), ::isspace ), linkType.end() );
+ linkType.erase( remove_if( linkType.begin(), linkType.end(), isspace ), linkType.end() );
// Some implementation (SharePoint) are omitting the type attribute
bool matchesType = m_type.empty( ) || linkType.empty() || ( linkType == m_type );
diff --git a/src/libcmis/document.hxx b/src/libcmis/document.hxx
index 0473012..a6736d7 100644
--- a/src/libcmis/document.hxx
+++ b/src/libcmis/document.hxx
@@ -140,7 +140,7 @@ namespace libcmis
virtual std::string toString( );
};
- typedef ::boost::shared_ptr< Document > DocumentPtr;
+ typedef boost::shared_ptr< Document > DocumentPtr;
}
#endif
diff --git a/src/libcmis/folder.hxx b/src/libcmis/folder.hxx
index e001541..b9d7c57 100644
--- a/src/libcmis/folder.hxx
+++ b/src/libcmis/folder.hxx
@@ -59,16 +59,16 @@ namespace libcmis
virtual std::vector< std::string > getPaths( );
- virtual ::boost::shared_ptr< Folder > getFolderParent( ) throw ( Exception );
+ virtual boost::shared_ptr< Folder > getFolderParent( ) throw ( Exception );
virtual std::vector< ObjectPtr > getChildren( ) throw ( Exception ) = 0;
virtual std::string getParentId( );
virtual std::string getPath( );
virtual bool isRootFolder( );
- virtual ::boost::shared_ptr< Folder > createFolder( const std::map< std::string, PropertyPtr >& properties )
+ virtual boost::shared_ptr< Folder > createFolder( const std::map< std::string, PropertyPtr >& properties )
throw ( libcmis::Exception ) = 0;
- virtual ::boost::shared_ptr< Document > createDocument( const std::map< std::string, PropertyPtr >& properties,
+ virtual boost::shared_ptr< Document > createDocument( const std::map< std::string, PropertyPtr >& properties,
boost::shared_ptr< std::ostream > os, std::string contentType, std::string fileName ) throw ( Exception ) = 0;
virtual std::vector< std::string > removeTree( bool allVersion = true, UnfileObjects::Type unfile = UnfileObjects::Delete,
@@ -76,7 +76,7 @@ namespace libcmis
virtual std::string toString( );
};
- typedef ::boost::shared_ptr< Folder > FolderPtr;
+ typedef boost::shared_ptr< Folder > FolderPtr;
}
diff --git a/src/libcmis/gdrive-folder.cxx b/src/libcmis/gdrive-folder.cxx
index e5e14af..840539e 100644
--- a/src/libcmis/gdrive-folder.cxx
+++ b/src/libcmis/gdrive-folder.cxx
@@ -159,7 +159,7 @@ libcmis::DocumentPtr GDriveFolder::createDocument(
// parse the document
Json jsonRes = Json::parse( res );
- ::boost::shared_ptr< GDriveDocument >
+ boost::shared_ptr< GDriveDocument >
gDocument( new GDriveDocument( getSession( ), jsonRes ) );
// Upload stream
diff --git a/src/libcmis/json-utils.cxx b/src/libcmis/json-utils.cxx
index b4e037d..de78574 100644
--- a/src/libcmis/json-utils.cxx
+++ b/src/libcmis/json-utils.cxx
@@ -188,7 +188,7 @@ Json Json::parse( const string& str ) throw ( libcmis:: Exception )
{
try
{
- ::property_tree::json_parser::read_json( ss, pTree );
+ property_tree::json_parser::read_json( ss, pTree );
}
catch ( boost::exception const& )
{
diff --git a/src/libcmis/oauth2-data.hxx b/src/libcmis/oauth2-data.hxx
index 000f939..dc8fb77 100644
--- a/src/libcmis/oauth2-data.hxx
+++ b/src/libcmis/oauth2-data.hxx
@@ -69,7 +69,7 @@ namespace libcmis
const std::string& getScope() { return m_scope; }
const std::string& getRedirectUri() { return m_redirectUri; }
};
- typedef ::boost::shared_ptr< OAuth2Data > OAuth2DataPtr;
+ typedef boost::shared_ptr< OAuth2Data > OAuth2DataPtr;
}
#endif //_LIBCMIS_OAUTH2_DATA_HXX_
diff --git a/src/libcmis/object-type.hxx b/src/libcmis/object-type.hxx
index 629663c..bfebc59 100644
--- a/src/libcmis/object-type.hxx
+++ b/src/libcmis/object-type.hxx
@@ -137,7 +137,7 @@ namespace libcmis
virtual std::string toString( );
};
- typedef ::boost::shared_ptr< ObjectType > ObjectTypePtr;
+ typedef boost::shared_ptr< ObjectType > ObjectTypePtr;
}
#endif
diff --git a/src/libcmis/object.hxx b/src/libcmis/object.hxx
index d7d3603..932bc60 100644
--- a/src/libcmis/object.hxx
+++ b/src/libcmis/object.hxx
@@ -214,7 +214,7 @@ namespace libcmis
void toXml( xmlTextWriterPtr writer );
};
- typedef ::boost::shared_ptr< Object > ObjectPtr;
+ typedef boost::shared_ptr< Object > ObjectPtr;
}
#endif
diff --git a/src/libcmis/property-type.hxx b/src/libcmis/property-type.hxx
index 56be223..0fb490e 100644
--- a/src/libcmis/property-type.hxx
+++ b/src/libcmis/property-type.hxx
@@ -119,7 +119,7 @@ namespace libcmis
void update( std::vector< ObjectTypePtr > typesDefs );
};
- typedef ::boost::shared_ptr< PropertyType > PropertyTypePtr;
+ typedef boost::shared_ptr< PropertyType > PropertyTypePtr;
}
#endif
diff --git a/src/libcmis/property.hxx b/src/libcmis/property.hxx
index aa65605..567cefb 100644
--- a/src/libcmis/property.hxx
+++ b/src/libcmis/property.hxx
@@ -79,7 +79,7 @@ namespace libcmis
std::string toString( );
};
- typedef ::boost::shared_ptr< Property > PropertyPtr;
+ typedef boost::shared_ptr< Property > PropertyPtr;
typedef std::map< std::string, libcmis::PropertyPtr > PropertyPtrMap;
PropertyPtr parseProperty( xmlNodePtr node, boost::shared_ptr< ObjectType > objectType );
diff --git a/src/libcmis/rendition.hxx b/src/libcmis/rendition.hxx
index 2e38651..f8c23b4 100644
--- a/src/libcmis/rendition.hxx
+++ b/src/libcmis/rendition.hxx
@@ -81,7 +81,7 @@ namespace libcmis
std::string toString( );
};
- typedef ::boost::shared_ptr< Rendition > RenditionPtr;
+ typedef boost::shared_ptr< Rendition > RenditionPtr;
}
#endif
diff --git a/src/libcmis/repository.hxx b/src/libcmis/repository.hxx
index a4435d8..320cbb4 100644
--- a/src/libcmis/repository.hxx
+++ b/src/libcmis/repository.hxx
@@ -111,7 +111,7 @@ namespace libcmis
static std::map< Capability, std::string > parseCapabilities( xmlNodePtr node );
};
- typedef ::boost::shared_ptr< Repository > RepositoryPtr;
+ typedef boost::shared_ptr< Repository > RepositoryPtr;
}
#endif
diff --git a/src/libcmis/session-factory.hxx b/src/libcmis/session-factory.hxx
index 9349b1c..8cc1f26 100644
--- a/src/libcmis/session-factory.hxx
+++ b/src/libcmis/session-factory.hxx
@@ -57,7 +57,7 @@ namespace libcmis
*/
virtual bool authenticationQuery( std::string& username, std::string& password ) = 0;
};
- typedef ::boost::shared_ptr< AuthProvider > AuthProviderPtr;
+ typedef boost::shared_ptr< AuthProvider > AuthProviderPtr;
/** Handler class used to request user input when an invalid SSL certificate is encountered.
*/
@@ -77,7 +77,7 @@ namespace libcmis
*/
virtual bool validateCertificate( std::vector< std::string > certificatesChain ) = 0;
};
- typedef ::boost::shared_ptr< CertValidationHandler > CertValidationHandlerPtr;
+ typedef boost::shared_ptr< CertValidationHandler > CertValidationHandlerPtr;
class SessionFactory
{
diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
index 7070067..599edf2 100644
--- a/src/libcmis/xml-utils.cxx
+++ b/src/libcmis/xml-utils.cxx
@@ -551,7 +551,7 @@ namespace libcmis
string lower( sText );
for ( size_t i = 0; i < sText.size(); ++i )
{
- lower[i] = ::tolower( sText[i] );
+ lower[i] = tolower( sText[i] );
}
return lower;
}
--
2.9.4

127
recipes-support/libcmis/files/0003-do-not-reinvent-the-wheel.patch Normal file
View File

@@ -0,0 +1,127 @@
From ca381ff4586c9fc1190d285137ba8f67b102d600 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 16 May 2017 11:52:43 +0200
Subject: [PATCH 2/3] do not reinvent the wheel
---
configure.ac | 1 +
src/libcmis/atom-session.cxx | 3 ++-
src/libcmis/property.cxx | 4 +++-
src/libcmis/ws-relatedmultipart.cxx | 2 +-
src/libcmis/xml-utils.cxx | 11 -----------
src/libcmis/xml-utils.hxx | 2 --
6 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 41b7a62..ae1eddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,7 @@ m4_pattern_allow([^BOOST_])
BOOST_REQUIRE([1.36])
BOOST_DATE_TIME
BOOST_SMART_PTR
+BOOST_STRING_ALGO
BOOST_UUID
AS_IF([test "x$enable_client" != "xno"], [
diff --git a/src/libcmis/atom-session.cxx b/src/libcmis/atom-session.cxx
index 5772efc..c263f58 100644
--- a/src/libcmis/atom-session.cxx
+++ b/src/libcmis/atom-session.cxx
@@ -27,6 +27,7 @@
*/
#include <string>
+#include <boost/algorithm/string.hpp>
#include <boost/shared_ptr.hpp>
#include <libxml/parser.h>
@@ -127,7 +128,7 @@ void AtomPubSession::parseServiceDocument( const string& buf ) throw ( libcmis::
m_repositoryId = ws->getId( );
// SharePoint is case insensitive for the id...
- if ( libcmis::tolower( ws->getId( ) ) == libcmis::tolower( m_repositoryId ) )
+ if ( boost::to_lower_copy( ws->getId( ) ) == boost::to_lower_copy( m_repositoryId ) )
m_repository = ws;
m_repositories.push_back( ws );
diff --git a/src/libcmis/property.cxx b/src/libcmis/property.cxx
index e0249a5..b303fe5 100644
--- a/src/libcmis/property.cxx
+++ b/src/libcmis/property.cxx
@@ -26,6 +26,8 @@
* instead of those above.
*/
+#include <boost/algorithm/string.hpp>
+
#include "object-type.hxx"
#include "property.hxx"
#include "xml-utils.hxx"
@@ -191,7 +193,7 @@ namespace libcmis
size_t pos = xmlType.find( propStr );
if ( pos == 0 ) {
xmlType = xmlType.substr( propStr.length( ) );
- xmlType = libcmis::tolower( xmlType );
+ boost::to_lower( xmlType );
}
propType.reset( new PropertyType( xmlType, propDefinitionId,
diff --git a/src/libcmis/ws-relatedmultipart.cxx b/src/libcmis/ws-relatedmultipart.cxx
index df2471a..3b31634 100644
--- a/src/libcmis/ws-relatedmultipart.cxx
+++ b/src/libcmis/ws-relatedmultipart.cxx
@@ -179,7 +179,7 @@ RelatedMultipart::RelatedMultipart( const string& body, const string& contentTyp
size_t colonPos = line.find( ":" );
string headerName = line.substr( 0, colonPos );
string headerValue = line.substr( colonPos + 1 );
- if ( libcmis::tolower( headerName ) == libcmis::tolower( "Content-Id" ) )
+ if ( boost::to_lower_copy( headerName ) == "content-id" )
{
cid = libcmis::trim( headerValue );
// Remove the '<' '>' around the id if any
diff --git a/src/libcmis/xml-utils.cxx b/src/libcmis/xml-utils.cxx
index 599edf2..d20ff47 100644
--- a/src/libcmis/xml-utils.cxx
+++ b/src/libcmis/xml-utils.cxx
@@ -26,7 +26,6 @@
* instead of those above.
*/
-#include <cctype>
#include <errno.h>
#include <sstream>
#include <stdlib.h>
@@ -546,16 +545,6 @@ namespace libcmis
return out.str();
}
- string tolower( string sText )
- {
- string lower( sText );
- for ( size_t i = 0; i < sText.size(); ++i )
- {
- lower[i] = tolower( sText[i] );
- }
- return lower;
- }
-
int stringstream_write_callback( void * context, const char * s, int len )
{
stringstream * ss=static_cast< stringstream * >( context );
diff --git a/src/libcmis/xml-utils.hxx b/src/libcmis/xml-utils.hxx
index 58e9e8d..3bb21bb 100644
--- a/src/libcmis/xml-utils.hxx
+++ b/src/libcmis/xml-utils.hxx
@@ -156,8 +156,6 @@ namespace libcmis
std::string sha1( const std::string& str );
- std::string tolower( std::string sText );
-
int stringstream_write_callback(void * context, const char * s, int len);
std::string escape( std::string str );
--
2.9.4

39
recipes-support/libcmis/files/0004-fix-build-error-with-gcc-std-c-98.patch Normal file
View File

@@ -0,0 +1,39 @@
From 86a50d6bad2ba44a8107ddb379d2ec6b84537a48 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 16 May 2017 11:58:12 +0200
Subject: [PATCH 3/3] fix build error with gcc -std=c++98
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
atom-object.cxx: In member function ‘bool {anonymous}::MatchLink::operator()(AtomLink)’:
atom-object.cxx:63:91: error: no matching function for call to ‘remove_if(std::__cxx11::basic_string<char>::iterator, std::__cxx11::basic_string<char>::iterator, <unresolved overloaded function type>)’
linkType.erase( remove_if( linkType.begin(), linkType.end(), std::isspace ), linkType.end() );
---
src/libcmis/atom-object.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/libcmis/atom-object.cxx b/src/libcmis/atom-object.cxx
index 01454a4..510f013 100644
--- a/src/libcmis/atom-object.cxx
+++ b/src/libcmis/atom-object.cxx
@@ -30,6 +30,7 @@
#include <locale>
#include <sstream>
+#include <boost/algorithm/string.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include "atom-document.hxx"
@@ -59,7 +60,7 @@ namespace
// Some implementations (xcmis) put extra spaces into the type attribute
// (e.g. "application/atom+xml; type=feed" instead of "application/atom+xml;type=feed")
string linkType = link.getType( );
- linkType.erase( remove_if( linkType.begin(), linkType.end(), isspace ), linkType.end() );
+ linkType.erase( remove_if( linkType.begin(), linkType.end(), boost::is_space() ), linkType.end() );
// Some implementation (SharePoint) are omitting the type attribute
bool matchesType = m_type.empty( ) || linkType.empty() || ( linkType == m_type );
--
2.9.4

14
recipes-support/libcmis/libcmis_0.5.2.bb → recipes-support/libcmis/libcmis_0.5.1.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "C++ client library for the CMIS interface"
HOMEPAGE = "https://github.com/tdf/libcmis"
LICENSE = "MPL-1.1 & GPL-2.0-only & LGPL-2.1-only"
LICENSE = "MPL-1.1 & GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = " \
file://COPYING.MPL;md5=0117647fecb9a932c25a7bbfc0333c37 \
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
@@ -10,10 +10,13 @@ LIC_FILES_CHKSUM = " \
SRC_URI = " \
https://github.com/tdf/libcmis/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
file://0001-Avoid-cross-compile-unsafe-paths.patch \
file://0002-drop-prefix.patch \
file://0003-do-not-reinvent-the-wheel.patch \
file://0004-fix-build-error-with-gcc-std-c-98.patch \
"
SRC_URI[md5sum] = "e3ebb4f603e62e748685b6376d5719d9"
SRC_URI[sha256sum] = "ed6f681a48abbf3c2324564b17a180d21fa9503230e8708825e1ad80daee4f81"
SRC_URI[md5sum] = "3270154f0f40d86fce849b161f914101"
SRC_URI[sha256sum] = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"
inherit autotools pkgconfig
@@ -21,8 +24,11 @@ DEPENDS = "curl libxml2 cppunit boost"
EXTRA_OECONF = " \
--without-man \
--disable-werror \
"
do_configure:prepend() {
do_configure_prepend() {
touch ${S}/README
}
BBCLASSEXTEND = "native"

16
recipes-support/libexttextcat/libexttextcat_3.4.4.bb Normal file
View File

@@ -0,0 +1,16 @@
SUMMARY = "N-Gram-Based Text Categorization library for language guessing"
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libexttextcat"
LICENSE = "BSD"
LIC_FILES_CHKSUM = " \
file://LICENSE;md5=873b1664864cb88b5f5b4eca62deb23c \
"
SRC_URI = "http://dev-www.libreoffice.org/src/${BPN}/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "bfa7107c27afda3a3afa4b7ab5a3fe17"
SRC_URI[sha256sum] = "f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293"
inherit autotools pkgconfig
FILES_${PN} += "${datadir}/vala"
BBCLASSEXTEND = "native"

Some files were not shown because too many files have changed in this diff Show More