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:dunfell
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 ... dunfell

Author SHA1 Message Date
Andreas Müller
8cd4718363 libreoffice: upgrade 7.1.2.2 -> 7.1.3.2 
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
(cherry picked from commit f36398c316)
 2021-05-13 16:07:13 +02:00
69 changed files with 412 additions and 1262 deletions
Expand all files Collapse all files

4
README.md
View File

@@ -17,8 +17,8 @@ Policies
* **Please do not send private emails to maintainer - they will not be answered anymore**. For bug-reports/questions/suggestions.. use [issues](https://github.com/schnitzeltony/meta-office/issues).
* Pull requests should follow [OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) with the following additions:
* Use 4 spaces for indentation always (shell and python code)
* For splitting of long list values use four-space indentation on 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.
* For splitting of long list values use four-space indentation on sucessive lines and prefer the closing quote as the first character ([OE-Styleguide](https://www.openembedded.org/wiki/Styleguide) - second example)
* Pull-requests with patches fixing issues for musl, clang or gold-linker are accepeted only if patches have upstream-status "Applied" or "Backport" and contain a link to the upstream patch.
* 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.

3
appends/harfbuzz/harfbuzz_%.bbappend
View File

@@ -1,2 +1 @@
PACKAGECONFIG:append:class-native = " graphite"
PACKAGECONFIG:append:class-target = " graphite"
PACKAGECONFIG_append = " 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
}

3
conf/layer.conf
View File

@@ -15,8 +15,9 @@ LAYERDEPENDS_office-layer = " \
networking-layer \
"
LAYERSERIES_COMPAT_office-layer = "honister kirkstone mickledore nanbield"
LAYERSERIES_COMPAT_office-layer = "dunfell gatesgarth hardknott"
SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
libreoffice-dictionaries->hunspell \
"

180
recipes-abiword/abiword/abiword/0002-Bug-13770-Require-C-11-from-now-on.patch Normal file
View File

@@ -0,0 +1,180 @@
From f6d0dc338fe867c1b064682ae7f15bffe019b306 Mon Sep 17 00:00:00 2001
From: Hubert Figuiere <hub@figuiere.net>
Date: Tue, 12 Apr 2016 02:55:47 +0000
Subject: [PATCH] Bug 13770 - Require C++11 from now on.
git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/trunk@35197 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
Upstream-Status: Backport
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
ax_cxx_compile_stdcxx_11.m4 | 133 +++++++++++++++++++++++++++++++++++
configure.ac | 1 +
src/wp/ap/gtk/ap_UnixApp.cpp | 2 +-
3 files changed, 135 insertions(+), 1 deletion(-)
create mode 100644 ax_cxx_compile_stdcxx_11.m4
diff --git a/ax_cxx_compile_stdcxx_11.m4 b/ax_cxx_compile_stdcxx_11.m4
new file mode 100644
index 0000000..af37acd
--- /dev/null
+++ b/ax_cxx_compile_stdcxx_11.m4
@@ -0,0 +1,133 @@
+# ============================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#
+# DESCRIPTION
+#
+# Check for baseline language coverage in the compiler for the C++11
+# standard; if necessary, add switches to CXXFLAGS to enable support.
+#
+# The first argument, if specified, indicates whether you insist on an
+# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+# -std=c++11). If neither is specified, you get whatever works, with
+# preference for an extended mode.
+#
+# The second argument, if specified 'mandatory' or if left unspecified,
+# indicates that baseline C++11 support is required and that the macro
+# should error out if no mode with that support is found. If specified
+# 'optional', then configuration proceeds regardless, after defining
+# HAVE_CXX11 if and only if a supporting mode is found.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
+# Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
+# Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 3
+
+m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [
+ template <typename T>
+ struct check
+ {
+ static_assert(sizeof(int) <= sizeof(T), "not big enough");
+ };
+
+ typedef check<check<bool>> right_angle_brackets;
+
+ int a;
+ decltype(a) b;
+
+ typedef check<int> check_type;
+ check_type c;
+ check_type&& cr = static_cast<check_type&&>(c);
+
+ auto d = a;
+])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
+ m4_if([$1], [], [],
+ [$1], [ext], [],
+ [$1], [noext], [],
+ [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl
+ m4_if([$2], [], [ax_cxx_compile_cxx11_required=true],
+ [$2], [mandatory], [ax_cxx_compile_cxx11_required=true],
+ [$2], [optional], [ax_cxx_compile_cxx11_required=false],
+ [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])])dnl
+ AC_LANG_PUSH([C++])dnl
+ ac_success=no
+ AC_CACHE_CHECK(whether $CXX supports C++11 features by default,
+ ax_cv_cxx_compile_cxx11,
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [ax_cv_cxx_compile_cxx11=yes],
+ [ax_cv_cxx_compile_cxx11=no])])
+ if test x$ax_cv_cxx_compile_cxx11 = xyes; then
+ ac_success=yes
+ fi
+
+ m4_if([$1], [noext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=gnu++11 -std=gnu++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+
+ m4_if([$1], [ext], [], [dnl
+ if test x$ac_success = xno; then
+ for switch in -std=c++11 -std=c++0x; do
+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+ AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+ $cachevar,
+ [ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $switch"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+ [eval $cachevar=yes],
+ [eval $cachevar=no])
+ CXXFLAGS="$ac_save_CXXFLAGS"])
+ if eval test x\$$cachevar = xyes; then
+ CXXFLAGS="$CXXFLAGS $switch"
+ ac_success=yes
+ break
+ fi
+ done
+ fi])
+ AC_LANG_POP([C++])
+ if test x$ax_cxx_compile_cxx11_required = xtrue; then
+ if test x$ac_success = xno; then
+ AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+ fi
+ else
+ if test x$ac_success = xno; then
+ HAVE_CXX11=0
+ AC_MSG_NOTICE([No compiler with C++11 support was found])
+ else
+ HAVE_CXX11=1
+ AC_DEFINE(HAVE_CXX11,1,
+ [define if the compiler supports basic C++11 syntax])
+ fi
+
+ AC_SUBST(HAVE_CXX11)
+ fi
+])
diff --git a/configure.ac b/configure.ac
index 48228be..f7be7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,7 @@ win_pkgs="$enchant_req"
AC_PROG_CC
AC_PROG_CXX
+AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
#AC_PROG_OBJC
AC_PROG_INSTALL
# For libtool 1.5.x compatability (AC_PROG_LIBTOOL is deprecated version of LT_INIT)
diff --git a/src/wp/ap/gtk/ap_UnixApp.cpp b/src/wp/ap/gtk/ap_UnixApp.cpp
index 061a304..260f8e5 100644
--- a/src/wp/ap/gtk/ap_UnixApp.cpp
+++ b/src/wp/ap/gtk/ap_UnixApp.cpp
@@ -863,7 +863,7 @@ static bool is_so (const char *file) {
if (len < (strlen(G_MODULE_SUFFIX) + 2)) // this is ".so" and at least one char for the filename
return false;
const char *suffix = file+(len-3);
- if(0 == strcmp (suffix, "."G_MODULE_SUFFIX))
+ if(0 == strcmp (suffix, "." G_MODULE_SUFFIX))
return true;
return false;
}

41
recipes-abiword/abiword/abiword_3.0.5.bb → recipes-abiword/abiword/abiword_3.0.4.bb
View File

@@ -1,7 +1,7 @@
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"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=ecd3ac329fca77e2d0e412bec38e1c20"
DEPENDS = " \
perl-native \
@@ -18,20 +18,22 @@ DEPENDS = " \
libxslt \
redland rasqal \
"
RDEPENDS:${PN}:append:libc-glibc = " \
RDEPENDS_${PN}_append_libc-glibc = " \
glibc-gconv-ibm850 glibc-gconv-cp1252 \
glibc-gconv-iso8859-15 glibc-gconv-iso8859-1 \
"
RCONFLICTS:${PN} = "${PN}-embedded"
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 \
file://0002-Bug-13770-Require-C-11-from-now-on.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=c5edcc3ccd864b19004d14e9c1c9a26a"
SRC_URI[sha256sum] = "1257247e9970508d6d1456d3e330cd1909c4b42b25e0f0a1bc32526d6f3a21b4"
SRC_URI[md5sum] = "04e31887049a8c72297881bc153b77c4"
SRC_URI[sha256sum] = "e93096cb192e5bc19d62e180fc5eda643206465315a710113ae5036bc2a1a5d7"
#want 3.x from 3.x.y for the installation directory
SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
@@ -62,7 +64,6 @@ EXTRA_OECONF = " \
--with-libwmf-config=${STAGING_DIR} \
"
CXXFLAGS += "-std=c++11"
LDFLAGS += "-lgmodule-2.0"
do_compile() {
@@ -75,7 +76,7 @@ do_compile() {
PACKAGES += " ${PN}-clipart ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
FILES:${PN} += " \
FILES_${PN} += " \
${libdir}/lib${PN}-*.so \
${datadir}/mime-info \
${datadir}/icons/* \
@@ -102,31 +103,31 @@ FILES:${PN} += " \
# don't steal /usr/lib/libabiword-3.0.so from ${PN}
# in this case it's needed in ${PN}
FILES:${PN}-dev = " \
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}-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"
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 () {
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, "")
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()
@@ -134,10 +135,10 @@ python populate_packages:prepend () {
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')
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"
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"

2
recipes-filter/libabw/libabw_0.1.3.bb
View File

@@ -16,3 +16,5 @@ DEPENDS = " \
libxml2 \
librevenge \
"
BBCLASSEXTEND = "native"

2
recipes-filter/libcdr/libcdr_0.1.7.bb
View File

@@ -13,3 +13,5 @@ SRC_URI[sha256sum] = "5666249d613466b9aa1e987ea4109c04365866e9277d80f6cd9663e86b
inherit autotools pkgconfig
DEPENDS = "icu lcms librevenge"
BBCLASSEXTEND = "native"

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

@@ -15,3 +15,5 @@ SRC_URI[sha256sum] = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34
inherit autotools pkgconfig
DEPENDS = "icu libxml2 librevenge liblangtag boost-native gperf-native"
BBCLASSEXTEND = "native"

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

@@ -13,3 +13,5 @@ SRC_URI[sha256sum] = "e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa5863
inherit autotools pkgconfig
DEPENDS = "glm icu lcms libxml2 librevenge liblangtag mdds-1.2"
BBCLASSEXTEND = "native"

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

@@ -16,3 +16,5 @@ SRC_URI[sha256sum] = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420
inherit autotools pkgconfig
DEPENDS = "icu lcms librevenge gperf-native"
BBCLASSEXTEND = "native"

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

@@ -12,6 +12,6 @@ SRC_URI[sha256sum] = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706
inherit autotools pkgconfig
CXXFLAGS += "-std=c++11 -DGLM_ENABLE_EXPERIMENTAL=1"
CXXFLAGS += "-DGLM_ENABLE_EXPERIMENTAL=1"
DEPENDS = "glew glm boost"

2
recipes-filter/libmspub/libmspub_0.1.4.bb
View File

@@ -14,3 +14,5 @@ SRC_URI[sha256sum] = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702
inherit autotools pkgconfig
DEPENDS = "icu librevenge"
BBCLASSEXTEND = "native"

6
recipes-filter/libmwaw/libmwaw_0.3.21.bb → recipes-filter/libmwaw/libmwaw_0.3.17.bb
View File

@@ -1,14 +1,16 @@
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"
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"
SRC_URI[sha256sum] = "a227a454b894804683e6ce9c0880ffcdafc7fe9f4b54db2d056a5cc3dfc23634"
SRC_URI[sha256sum] = "8f81cc27b63d508576a43ef7448f78bec2fde7c7349b08273400e4de897f651c"
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"
BBCLASSEXTEND = "native"

2
recipes-filter/libodfgen/libodfgen_0.1.7.bb
View File

@@ -12,3 +12,5 @@ SRC_URI[sha256sum] = "323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b39
inherit autotools pkgconfig perlnative
DEPENDS = "librevenge"
BBCLASSEXTEND = "native"

2
recipes-filter/libpagemaker/libpagemaker_0.0.4.bb
View File

@@ -14,3 +14,5 @@ SRC_URI[sha256sum] = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a4
inherit autotools pkgconfig
DEPENDS = "icu librevenge"
BBCLASSEXTEND = "native"

2
recipes-filter/libvisio/libvisio_0.1.7.bb
View File

@@ -11,3 +11,5 @@ SRC_URI[sha256sum] = "8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b716
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

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

@@ -5,13 +5,12 @@ 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 = "http://dev-www.libreoffice.org/src/${BPN}-${PV}.tar.xz"
SRC_URI[md5sum] = "d5e44712c4674d499afb8e89d830fcad"
SRC_URI[sha256sum] = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09"
inherit autotools pkgconfig perlnative
DEPENDS = "librevenge"
BBCLASSEXTEND = "native"

4
recipes-filter/libwpg/libwpg_0.3.3.bb
View File

@@ -12,4 +12,6 @@ SRC_URI[sha256sum] = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53
inherit autotools pkgconfig
DEPENDS = "librevenge libwpd zlib"
RDEPENDS:${PN} = "perl"
RDEPENDS_${PN} = "perl"
BBCLASSEXTEND = "native"

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

@@ -12,3 +12,5 @@ SRC_URI[sha256sum] = "13beb0c733bb1544a542b6ab1d9d205f218e9a2202d1d4cac056f79f6d
inherit autotools-brokensep pkgconfig
DEPENDS = "librevenge"
BBCLASSEXTEND = "native"

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 \
"

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

@@ -18,15 +18,32 @@ DEPENDS += " \
lcms-native \
nss-native \
cppunit-native \
libabw-native \
libcdr-native \
libe-book-native \
libfreehand-native \
hunspell-native \
mythes-native \
clucene-core-native \
libcmis-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 \
libwpd-native \
libwpg-native \
libwps-native \
libcdr-native \
libmspub-native \
libmwaw-native \
libodfgen-native \
mdds-1.5-native \
"
SRC_URI += " \
@@ -34,18 +51,12 @@ SRC_URI += " \
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 \
"
EXTRA_OECONF += " \
--without-java \
\
--disable-gui \
--disable-extensions \
--disable-extension-integration \
\
--disable-mariadb-sdbc \
--disable-postgresql-sdbc \
--disable-lotuswordpro \
--disable-firebird-sdbc \
@@ -54,8 +65,6 @@ EXTRA_OECONF += " \
--disable-scripting-javascript \
--disable-pdfimport \
--disable-coinmp \
--disable-opencl \
--disable-zxing \
"
do_configure() {
@@ -103,7 +112,7 @@ LOBUILDTOOLS = " \
saxparser \
svidl \
ulfex \
unoidl-check \
unoidl-write \
xrmex \
"
@@ -112,7 +121,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

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

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

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

@@ -1,5 +1,5 @@
PV = "7.4.2.3"
DIRV = "7.4.2"
PV = "7.1.3.2"
DIRV = "7.1.3"
SRC_URI += "http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz"
SRC_URI[sha256sum] = "82c1ffe02f2ed8ee1451a9f67c35335b27a638db591f9bc539eff86ab14dd95a"
SRC_URI[sha256sum] = "35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf"

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

@@ -16,10 +16,9 @@ SRC_URI += " \
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 \
"
SRC_URI[translations.sha256sum] = "c8053f863c95c31a83a079bb2eefd9b666ffd59e40c4344098c04a924a54f6e1"
SRC_URI[translations.sha256sum] = "86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327"
DEPENDS += " \
${BPN}-native \
@@ -27,12 +26,15 @@ DEPENDS += " \
curl \
icu \
expat \
poppler \
harfbuzz \
openldap \
nss \
zlib \
jpeg \
libpng \
apr \
serf \
libatomic-ops \
lcms \
harfbuzz \
@@ -41,7 +43,6 @@ DEPENDS += " \
openssl \
cups \
gstreamer1.0-plugins-base \
tiff \
\
glm \
redland \
@@ -51,6 +52,7 @@ DEPENDS += " \
libwpd \
libcdr \
librevenge \
libcmis \
libfreehand \
libe-book \
libmwaw \
@@ -62,6 +64,7 @@ DEPENDS += " \
libgltf \
libexttextcat \
clucene-core \
vigra \
hunspell \
mythes \
hyphen \
@@ -69,7 +72,7 @@ DEPENDS += " \
liblangtag \
lpsolve \
gpgme \
mdds-2.0 \
mdds-1.5 \
"
# necessary to let the call for python-config succeed
@@ -96,7 +99,10 @@ EXTRA_OECONF += " \
--with-tls=nss \
--without-galleries \
\
--with-system-poppler \
--with-system-openldap \
--with-system-apr \
--with-system-serf \
--with-system-libatomic_ops \
--with-system-icu \
--with-system-expat \
@@ -107,17 +113,10 @@ EXTRA_OECONF += " \
--with-system-glm \
--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 \
--with-system-libvisio \
--with-system-libmspub \
--with-system-libpagemaker \
--with-system-libodfgen \
--with-system-libexttextcat \
@@ -125,7 +124,6 @@ EXTRA_OECONF += " \
--with-system-mythes \
--with-system-altlinuxhyph \
--with-system-gpgmepp \
--with-system-libtiff \
\
--with-external-dict-dir=${datadir}/hunspell \
--with-system-dicts \
@@ -172,7 +170,7 @@ do_configure() {
sed -i 's:-I${includedir}/gpgme++:-I${STAGING_INCDIR}/gpgme++:g' ${B}/config_host.mk
}
do_compile:prepend() {
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
@@ -202,7 +200,7 @@ do_install() {
}
FILES:${PN} += " \
FILES_${PN} += " \
${datadir}/icons \
${datadir}/metainfo \
${datadir}/mime \
@@ -210,10 +208,10 @@ FILES:${PN} += " \
PACKAGES =+ "${PN}-odk ${PN}-officekit"
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 = " \
FILES_${PN}-officekit = " \
${libdir}/girepository-1.0 \
${libdir}/liblibreofficekitgtk.so \
"
@@ -292,19 +290,19 @@ python lo_do_split_locales() {
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 "
PACKAGESPLITFUNCS_prepend = "lo_do_split_locales "
RDEPENDS:${PN} = "hunspell-dictionaries"
RDEPENDS_${PN} = "hunspell-dictionaries"

28
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"
LICENSE = "GPLv3 & LGPLv3 & MPLv1.1"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://COPYING.LGPL;md5=6a6a8e020838b23406c81b19c1d46df6 \
@@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = " \
require libreoffice-version.inc
SRC_URI += " \
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv;branch=master;protocol=https \
git://github.com/dagwieers/unoconv.git;destsuffix=git/unoconv;name=unoconv \
file://0001-Workaround-boost-library-detection-failures.patch \
file://0002-Fix-build-with-icu-68.patch \
"
SRCREV_unoconv = "260b815bf2c57118df439f381974f3f0987222a1"
inherit autotools pkgconfig python3native setuptools3-base perlnative
inherit autotools pkgconfig python3native distutils3-base perlnative
DEPENDS += " \
python3-lxml-native \
@@ -53,15 +53,33 @@ EXTRA_OECONF = " \
--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-libpagemaker \
--with-system-glm \
--with-system-libetonyek \
--with-system-libvisio \
--with-system-libexttextcat \
--with-system-altlinuxhyph \
--with-system-librevenge \
--with-system-libabw \
--with-system-libcdr \
--with-system-libebook \
--with-system-libfreehand \
--with-system-liblangtag \
--with-system-zlib \
--with-system-lpsolve \
--with-system-libwpd \
--with-system-libwpg \
--with-system-libwps \
--with-system-libcdr \
--with-system-libmspub \
--with-system-libmwaw \
--with-system-mdds \
"
do_compile[network] = "1"

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

@@ -27,7 +27,7 @@ index 955aea1..f310c00 100644
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
@@ -8334,7 +8334,7 @@ if test $enable_python = system; then
# Fallback: Accept these in the environment, or as set above
# for MacOSX.
:

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

@@ -14,18 +14,18 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index f9a2644..c1a8f53 100644
index 393e94f..5cdb930 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -283,7 +283,7 @@ bootstrap: check-if-root compilerplugins
@@ -280,7 +280,7 @@ bootstrap: check-if-root compilerplugins
# Note: this will pipe through all gbuild targets to ... gbuild
# with some translations like "check"->"unitcheck subsequentcheck uicheck" for historic reasons
#
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset,install-gdb-printers) \
-build: bootstrap fetch $(if $(CROSS_COMPILING),cross-toolset) \
+build: bootstrap fetch \
$(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check)))
$(if $(filter check,$(MAKECMDGOALS)),$(if $(COMPILER_PLUGINS),$(if $(LODE_HOME),clang-format-check))) \
install-gdb-printers
$(MAKE) $(PARALLELISM_OPTION) $(IWYU_OPTION) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild $(build_goal)
ifeq ($(OS),iOS)
--
2.31.1
2.21.0

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

@@ -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

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

@@ -24,9 +24,9 @@ index dee46a3..fab7ddf 100644
- $(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 : \
@@ -37,7 +37,7 @@ $(i18npool_BIDIR)/dict_%.cxx : \
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),DIC)
$(call gb_Helper_abbreviate_dirs,\

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

@@ -16,23 +16,23 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 3ce723b..0c41954 100644
index c03bbbc..40b5865 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 \
@@ -24,7 +24,7 @@ $(call gb_CustomTarget_get_workdir,i18npool/localedata)/localedata_$(1).cxx : \
$$(call gb_Helper_print_on_error, \
$$(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))) && \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.sax > $@)
rm $@.sax
$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),SAX)
sed 's/\(^.*get[^;]*$$$$\)/SAL_DLLPUBLIC_EXPORT \1/' $$@.tmp > $$@ && \
rm $$@.tmp)
$$(call gb_Trace_EndRange,$$(subst $(WORKDIR)/,,$$@),SAX)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e7ced59..5277a81 100644
index 2611d94..d6a1997 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -175,6 +175,7 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final
@@ -155,6 +155,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
@@ -41,5 +41,5 @@ index e7ced59..5277a81 100644
gb_MoTarget_get_target = $(WORKDIR)/MoTarget/$(1).mo
gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf
--
2.35.3
2.21.0

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

@@ -9,23 +9,29 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Sun, 2 Feb 2020:
Adjusted for 6.4.0.3
Sat, 3 Oct 2020
Adjusted for 7.0.2.2
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
index 90e2280..0920cf2 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.))
- $(if $(PACKAGE_DEFINED),,$(call gb_Output_error,Something depends on package $* which does not exist.))
rm -f $@ && \
mv $(call gb_var2file,$@.tmp,100,$(sort $(FILES))) $@
mv $(call var2file,$@.tmp,100,$(sort $(FILES))) $@
$(call gb_Trace_EndRange,$*,PKG)
--
2.35.3
2.26.2

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

@@ -17,7 +17,7 @@ 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
@@ -8668,18 +8668,12 @@ if test "x$enable_postgresql_sdbc" != "xno"; then
pg_supp_path="$P_SEP$d$pg_supp_path"
done
fi

2
recipes-libreoffice/libreoffice/libreoffice/0008-avoid-downloading-by-git-submodules.patch
View File

@@ -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

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

@@ -19,7 +19,7 @@ diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop
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_
@@ -176,10 +176,10 @@ test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_
# create bash completion
mkdir -p $DESTDIR/usr/share/bash-completion/completions

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

3
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"

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"

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

@@ -1,13 +1,13 @@
SUMMARY = "Font rendering capabilities for complex non-Roman writing systems"
HOMEPAGE = "http://sourceforge.net/projects/silgraphite"
LICENSE = "LGPL-2.1-only"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=b0452d508cc4eb104de0226a5b0c8786"
inherit cmake
DEPENDS += "freetype"
SRC_URI = "git://github.com/silnrsi/graphite.git;branch=master;protocol=https"
SRC_URI = "git://github.com/silnrsi/graphite.git"
SRCREV = "92f59dcc52f73ce747f1cdc831579ed2546884aa"
PV = "1.3.14"
S = "${WORKDIR}/git"

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

@@ -1,14 +1,14 @@
HOMEPAGE = "http://helm.cs.unibo.it/mml-widget/"
DEPENDS = "t1lib gtk+ popt libxslt-native libxml2"
LICENSE = "LGPL-3.0-only"
LICENSE = "LGPLv3"
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 \
git://github.com/GNOME/gtkmathview.git \
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 \
@@ -22,7 +22,7 @@ inherit features_check autotools pkgconfig
REQUIRED_DISTRO_FEATURES = "x11"
do_configure:append() {
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"

6
recipes-support/libcmis/libcmis_0.5.2.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 \
@@ -23,6 +23,8 @@ EXTRA_OECONF = " \
--without-man \
"
do_configure:prepend() {
do_configure_prepend() {
touch ${S}/README
}
BBCLASSEXTEND = "native"

11
recipes-support/libexttextcat/libexttextcat_3.4.5.bb
View File

@@ -1,11 +1,16 @@
SUMMARY = "N-Gram-Based Text Categorization library for language guessing"
HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libexttextcat"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=873b1664864cb88b5f5b4eca62deb23c"
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] = "69c984b1785b56942179eb0ddc9c758f"
SRC_URI[sha256sum] = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"
inherit autotools pkgconfig
FILES:${PN} += "${datadir}/vala"
FILES_${PN} += "${datadir}/vala"
BBCLASSEXTEND = "native"

10
recipes-support/liblangtag/liblangtag_0.6.3.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "An interface library to access tags for identifying languages"
HOMEPAGE = "http://tagoh.bitbucket.org/liblangtag/"
LICENSE = "LGPL-3.0-only"
LICENSE = "LGPLv3"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02 \
"
@@ -12,10 +12,18 @@ SRC_URI = " \
file://0001-configure.ac-add-missing-HAVE_INTROSPECTION-check.patch \
file://0002-configure.ac-remove-untranslated-AX_CHECK_ENABLE_DEB.patch \
"
SRC_URI[md5sum] = "015274eb284b1dc82bf7af1d1774ec64"
SRC_URI[sha256sum] = "1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd"
inherit autotools pkgconfig gobject-introspection
do_configure_prepend() {
if ! grep -q ${HOST_SYS}-libtool ${S}/configure.ac; then
# align to native libtool
sed -i 's:libtool :${HOST_SYS}-libtool :g' ${S}/configure.ac
fi
}
export GIR_EXTRA_LIBS_PATH="${B}/liblangtag/.libs"
BBCLASSEXTEND = "native"

4
recipes-support/librevenge/librevenge_0.0.4.bb
View File

@@ -16,6 +16,8 @@ inherit autotools pkgconfig
DEPENDS = "cppunit zlib boost"
do_install:append() {
BBCLASSEXTEND = "native"
do_install_append() {
sed -i '/^Libs:/ s/$/ -lboost_system/' ${D}${libdir}/pkgconfig/librevenge-0.0.pc
}

2
recipes-support/lpsolve/lpsolve/0001-Align-compile.patch
View File

@@ -121,7 +121,7 @@ index 4afb1bf..995b0d9 100644
- $c -fpic -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. $opts $NOISNAN -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
- $c -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
-fi
+$CC $CFLAGS -fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+$CC $CFLAGS fPIC -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd -I. -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src
+$CC $LDFLAGS -shared -Wl,-Bsymbolic -Wl,-soname,liblpsolve55.so -o bin/$PLATFORM/liblpsolve55.so `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -lc -lm -ldl
rm *.o 2>/dev/null

4
recipes-support/lpsolve/lpsolve_5.5.2.5.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "A Mixed Integer Linear Programming (MILP) solver"
HOMEPAGE = "http://lpsolve.sourceforge.net/5.5/"
LICENSE = "LGPL-2.1-only"
LICENSE = "LGPL2.1"
LIC_FILES_CHKSUM = "file://README.txt;start_line=6;end_line=7;md5=883769a4ee3f3c1843e536ab0fabb3b2"
SRC_URI = " \
@@ -31,6 +31,6 @@ do_install() {
}
FILES_SOLIBSDEV = ""
FILES:${PN} += "${libdir}/liblpsolve55.so"
FILES_${PN} += "${libdir}/liblpsolve55.so"
BBCLASSEXTEND = "native"

18
recipes-support/mdds/mdds-2.0.bb
View File

@@ -1,18 +0,0 @@
SUMMARY = "A collection of multi-dimensional data structures and indexing algorithms"
HOMEPAGE = "https://gitlab.com/mdds/mdds"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=60a6093677ded88b5e28677e52a0c011"
inherit autotools-brokensep pkgconfig
SRC_URI = " \
git://gitlab.com/mdds/mdds.git;protocol=https;branch=master \
file://0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch \
"
PV = "2.0.1"
SRCREV = "311ba9e0ff8c29e50829ce5a8e936fbce288c6d7"
S = "${WORKDIR}/git"
DEPENDS = "boost"
BBCLASSEXTEND = "native"

28
recipes-support/mdds/mdds-2.0/0001-configure.ac-remove-fixed-paths-causing-trouble-when.patch
View File

@@ -1,28 +0,0 @@
From 97cb7eaa45c08a9b9850200e10ab5668df324ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Fri, 2 Aug 2019 16:45:27 +0200
Subject: [PATCH] configure.ac: remove fixed paths causing trouble when cross
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 | 1 -
1 file changed, 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index e9a4720f..21229ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,6 @@ AC_SUBST(QUICKCHECKDIR)
AX_CXX_COMPILE_STDCXX_17([noext], [mandatory])
CPPFLAGS="$CPPFLAGS -Wall -Wshadow -g -pedantic-errors"
-CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include"
AC_CHECK_SIZEOF([void *])
CXXFLAGS="$CXXFLAGS -DSIZEOF_VOID_P=$ac_cv_sizeof_void_p"
--
2.34.1

4
recipes-support/mythes/mythes_1.2.4.bb
View File

@@ -14,10 +14,10 @@ inherit autotools pkgconfig
DEPENDS = "hunspell"
do_configure:prepend() {
do_configure_prepend() {
touch ${S}/NEWS
}
RDEPENDS:${PN} = "perl"
RDEPENDS_${PN} = "perl"
BBCLASSEXTEND = "native"

14
recipes-support/potrace/potrace.bb
View File

@@ -1,14 +0,0 @@
SUMMARY = "Transform bitmaps into vector graphics"
HOMEPAGE = "http://potrace.sourceforge.net"
LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=6ccdcb5472e5e7e8061f4128ef20e049"
SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz"
SRC_URI[sha256sum] = "be8248a17dedd6ccbaab2fcc45835bb0502d062e40fbded3bc56028ce5eb7acc"
PV = "1.16"
DEPENDS = "zlib"
inherit autotools
EXTRA_OECONF = "--with-libpotrace"

2
recipes-support/redland/rasqal_0.9.33.bb
View File

@@ -1,5 +1,5 @@
SUMMARY = "Library for querying RDF"
LICENSE = "GPL-2.0-only | LGPL-2.0-only"
LICENSE = "GPLv2 | LGPLv2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \

31
recipes-support/redland/redland/0001-redland.pc.in-remove-rdf-s-private-flags.patch
View File

@@ -1,31 +0,0 @@
From 0f1da792935642bc0d73af867ea5be8323962f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Mon, 16 Aug 2021 20:38:28 +0200
Subject: [PATCH] redland.pc.in: remove rdf's private flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* flags are not required
* fails OE's pkgconfig sanity test
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
redland.pc.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/redland.pc.in b/redland.pc.in
index 3ca3bb9..f92932d 100644
--- a/redland.pc.in
+++ b/redland.pc.in
@@ -14,5 +14,4 @@ Description: Redland RDF API and triple store library
Requires.private: raptor2 >= @RAPTOR_MIN_VERSION@, rasqal >= @RASQAL_MIN_VERSION@, rasqal <= @RASQAL_MAX_VERSION@
Version: @VERSION@
Libs: -L${libdir} -lrdf
-Libs.private: @LIBRDF_LDFLAGS@ @LIBRDF_PKGCONFIG_PRIVATE_LIBS@
Cflags: -I${includedir}
--
2.31.1

7
recipes-support/redland/redland_1.0.17.bb
View File

@@ -1,5 +1,5 @@
SUMMARY = "Library providing the RDF API and triple stores"
LICENSE = "GPL-2.0-only | LGPL-2.0-only"
LICENSE = "GPLv2 | LGPLv2"
LIC_FILES_CHKSUM = " \
file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
@@ -7,10 +7,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS = "rasqal mariadb libtool"
SRC_URI = " \
http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
file://0001-redland.pc.in-remove-rdf-s-private-flags.patch \
"
SRC_URI = "http://download.librdf.org/source/${BPN}-${PV}.tar.gz"
SRC_URI[md5sum] = "e5be03eda13ef68aabab6e42aa67715e"
SRC_URI[sha256sum] = "de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681"

6
recipes-support/t1lib/t1lib_5.1.2.bb
View File

@@ -2,7 +2,7 @@ SUMMARY = "A Type1 Font Rastering Library"
SECTION = "libs"
DEPENDS = "virtual/libx11 libxaw"
LICENSE = "LGPL-2.0-only & GPL-2.0-only"
LICENSE = "LGPLv2 & GPLv2"
LIC_FILES_CHKSUM = " \
file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
@@ -27,5 +27,5 @@ TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OECONF = "--with-x --without-athena"
EXTRA_OEMAKE = "without_doc"
FILES:${PN} += " ${datadir}/t1lib/t1lib.config"
FILES:${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"
FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"

27
recipes-support/vigra/vigra_1.10.0.bb Normal file
View File

@@ -0,0 +1,27 @@
SUMMARY = "VIGRA is an image processing and analysis library"
HOMEPAGE = "http://ukoethe.github.io/vigra/"
LICENSE = "MIT"
LIC_FILES_CHKSUM = " \
file://LICENSE.txt;md5=3c8d5650f165c9d2bf413c64aa33dc15 \
"
SRC_URI = "git://github.com/ukoethe/vigra.git"
SRCREV = "e6c21f3506d783242222c44b2f4f4ec55afdab01"
S = "${WORKDIR}/git"
inherit cmake
DEPENDS = "tiff jpeg libpng"
EXTRA_OECMAKE += " \
-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \
-DWITH_VIGRANUMPY=0 \
"
do_install_append() {
# doc does not have useful content and is installed at the wrong location
# so delete it
rm -rf "${D}/${prefix}/doc"
}
BBCLASSEXTEND = "native"

2
recipes-support/wv/wv_1.2.9.bb
View File

@@ -1,6 +1,6 @@
SUMMARY = "Programs for accessing Microsoft Word documents"
HOMEPAGE = "http://wvware.sourceforge.net/"
LICENSE = "GPL-2.0-only"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f"
DEPENDS = "libgsf glib-2.0 libpng"

2
recipes-support/xlnt/xlnt_git.bb
View File

@@ -7,7 +7,7 @@ inherit cmake
#DEPENDS += "freetype"
SRC_URI = "git://github.com/tfussell/xlnt.git;branch=master;protocol=https"
SRC_URI = "git://github.com/tfussell/xlnt.git"
SRCREV = "e2262a0c65384416c8fb9263a057e7d0d3e381f6"
S = "${WORKDIR}/git"
PV = "1.4.0+git${SRCPV}"