summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-02 16:24:06 +0100
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-02-03 00:14:22 +0100
commit539b470a0cda5c8a7d1ab6d5a36e99da3aebb467 (patch)
treef03c208fd9b69e7f2680bddf2ba0809b578510e9
parent7cc1e8b324bbb671a62730c6e728fde064b32de4 (diff)
downloadoffice-539b470a0cda5c8a7d1ab6d5a36e99da3aebb467.tar.gz
office-539b470a0cda5c8a7d1ab6d5a36e99da3aebb467.tar.xz
libreoffice: version bump to 5.3.0.3
Change-Id: Iba21f7c703731e660f71ff39988c8f225e0f64b7 Reviewed-on: https://galileo.mailstation.de/gerrit/8209 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/app-office/libreoffice/files/3e42714c76b1347babfdea0564009d8d82a83af4.patch280
-rw-r--r--packages/app-office/libreoffice/files/libreoffice-5.2.1.2-xmlsec.patch33
-rw-r--r--packages/app-office/libreoffice/files/libreoffice-5.3.0.3-Fix-kde4-build-on-multiarch.patch (renamed from packages/app-office/libreoffice/files/libreoffice-4.4.1.2-Fix-kde4-build-on-multiarch.patch)6
-rw-r--r--packages/app-office/libreoffice/libreoffice-5.3.0.3.exheres-0 (renamed from packages/app-office/libreoffice/libreoffice-5.2.4.2.exheres-0)27
-rw-r--r--packages/app-office/libreoffice/libreoffice-5.exlib30
-rw-r--r--packages/app-office/libreoffice/libreoffice.exlib9
6 files changed, 21 insertions, 364 deletions
diff --git a/packages/app-office/libreoffice/files/3e42714c76b1347babfdea0564009d8d82a83af4.patch b/packages/app-office/libreoffice/files/3e42714c76b1347babfdea0564009d8d82a83af4.patch
deleted file mode 100644
index fce5fb6..0000000
--- a/packages/app-office/libreoffice/files/3e42714c76b1347babfdea0564009d8d82a83af4.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Upstream: yes, but only landed on master and libreoffice-5.3 branches
-
-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: 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>
-
-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=57
-+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/download.lst
-+++ b/download.lst
-@@ -62,7 +62,7 @@ export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2
- export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- export HUNSPELL_TARBALL := 33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz
- export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
--export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
-+export ICU_TARBALL := 1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz
- export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- export JFREEREPORT_FLUTE_TARBALL := d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- export JFREEREPORT_LIBBASE_TARBALL := eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-diff --git a/external/icu/icu-ubsan.patch.0 b/external/icu/icu-ubsan.patch.0
-index 6d1d3bc..8a47242 100644
---- a/external/icu/icu-ubsan.patch.0
-+++ b/external/icu/icu-ubsan.patch.0
-@@ -151,14 +151,3 @@
- length(len), next(subNode) {}
- virtual UBool operator==(const Node &other) const;
- virtual int32_t markRightEdgesFirst(int32_t edgeNumber);
----- source/common/unifiedcache.h
--+++ source/common/unifiedcache.h
--@@ -139,7 +139,7 @@
-- : CacheKey<T>(other), fLoc(other.fLoc) { }
-- virtual ~LocaleCacheKey() { }
-- virtual int32_t hashCode() const {
--- return 37 *CacheKey<T>::hashCode() + fLoc.hashCode();
--+ return 37U *CacheKey<T>::hashCode() + fLoc.hashCode();
-- }
-- virtual UBool operator == (const CacheKeyBase &other) const {
-- // reflexive
-diff --git a/external/icu/icu4c-warnings.patch b/external/icu/icu4c-warnings.patch
-index d146093..96608d7 100644
---- a/external/icu/icu4c-warnings.patch
-+++ b/external/icu/icu4c-warnings.patch
-@@ -8,15 +8,3 @@
- } \
- }
-
----- misc/icu/source/common/unicode/utypes.h
--+++ misc/build/icu/source/common/unicode/utypes.h
--@@ -399,7 +399,7 @@
-- * some Linux/Unix compilers have problems with defining global new/delete.
-- * On Windows, it is _MSC_VER>=1200 for MSVC 6.0 and higher.
-- */
---#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION))
--+#if defined(__cplusplus) && U_DEBUG && U_OVERRIDE_CXX_ALLOCATION && defined (_MSC_VER) && (_MSC_VER>=1200) && !defined(U_STATIC_IMPLEMENTATION) && (defined(U_COMMON_IMPLEMENTATION) || defined(U_I18N_IMPLEMENTATION) || defined(U_IO_IMPLEMENTATION) || defined(U_LAYOUT_IMPLEMENTATION) || defined(U_LAYOUTEX_IMPLEMENTATION))
--
-- #ifndef U_HIDE_INTERNAL_API
-- /**
--
-diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
-index 3b0b227..76ae209 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
-@@ -291,6 +291,17 @@
- #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: */
---
-cgit v0.10.2
-
diff --git a/packages/app-office/libreoffice/files/libreoffice-5.2.1.2-xmlsec.patch b/packages/app-office/libreoffice/files/libreoffice-5.2.1.2-xmlsec.patch
deleted file mode 100644
index 7c5193a..0000000
--- a/packages/app-office/libreoffice/files/libreoffice-5.2.1.2-xmlsec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Wouter van Kesteren <woutershep@gmail.com>
-Upstream: No, changed PKG_CONFIG="pkg-config" to a dnl comment.
-Reason: "checking for pkg-config... no" resuling in no crypto found
- and in turn the build fails.
-
-diff -Naur a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
---- a/external/libxmlsec/UnpackedTarball_xmlsec.mk 2016-08-25 02:26:36.000000000 +0200
-+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk 2016-09-19 11:31:45.389211578 +0200
-@@ -21,6 +21,8 @@
- xmlsec_patches += xmlsec1-customkeymanage.patch.1
- # Upstreamed as <https://github.com/lsh123/xmlsec/commit/7069e2b0ab49679008abedd6d223fb95538b0684>.
- xmlsec_patches += xmlsec1-ooxml.patch.1
-+# Exherbo 'pkg-config' banned by distribution
-+xmlsec_patches += xmlsec1-pkg-config.patch.1
-
- $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
-
-diff -Naur a/external/libxmlsec/xmlsec1-pkg-config.patch.1 b/external/libxmlsec/xmlsec1-pkg-config.patch.1
---- a/external/libxmlsec/xmlsec1-pkg-config.patch.1 1970-01-01 01:00:00.000000000 +0100
-+++ b/external/libxmlsec/xmlsec1-pkg-config.patch.1 2016-09-19 11:34:35.259402515 +0200
-@@ -0,0 +1,12 @@
-+diff -Naur a/configure.in b/configure.in
-+--- a/configure.in 2014-05-27 20:29:00.000000000 +0200
-++++ b/configure.in 2016-09-19 11:32:56.453137520 +0200
-+@@ -171,7 +171,7 @@
-+ dnl ==========================================================================
-+ dnl Check if pkg-config enabled and installed
-+ dnl ==========================================================================
-+-PKG_CONFIG="pkg-config"
-++dnl PKG_CONFIG="pkg-config"
-+ PKGCONFIG_FOUND="no"
-+ AC_ARG_ENABLE(pkgconfig, [ --enable-pkgconfig enable pkgconfig for configuration (yes)])
-+ if test "z$enable_pkgconfig" != "zno" ; then
diff --git a/packages/app-office/libreoffice/files/libreoffice-4.4.1.2-Fix-kde4-build-on-multiarch.patch b/packages/app-office/libreoffice/files/libreoffice-5.3.0.3-Fix-kde4-build-on-multiarch.patch
index b09660f..5b8406c 100644
--- a/packages/app-office/libreoffice/files/libreoffice-4.4.1.2-Fix-kde4-build-on-multiarch.patch
+++ b/packages/app-office/libreoffice/files/libreoffice-5.3.0.3-Fix-kde4-build-on-multiarch.patch
@@ -15,10 +15,10 @@ index 08bc106..056f67a 100644
fi
fi
if test -n "$KDE4DIR"; then
-- kde_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde_incdirs"
-+ kde_incdirs="$KDE4DIR/include $KDE4DIR/include/KDE4 $kde_incdirs"
+- kde4_incdirs="$KDE4DIR/include $KDE4DIR/include/kde4 $kde4_incdirs"
++ kde4_incdirs="$KDE4DIR/include $KDE4DIR/include/KDE4 $kde4_incdirs"
if test -z "$supports_multilib"; then
- kde_libdirs="$KDE4DIR/lib $kde_libdirs"
+ kde4_libdirs="$KDE4DIR/lib $kde4_libdirs"
else
--
2.3.3
diff --git a/packages/app-office/libreoffice/libreoffice-5.2.4.2.exheres-0 b/packages/app-office/libreoffice/libreoffice-5.3.0.3.exheres-0
index 05cd455..3437f42 100644
--- a/packages/app-office/libreoffice/libreoffice-5.2.4.2.exheres-0
+++ b/packages/app-office/libreoffice/libreoffice-5.3.0.3.exheres-0
@@ -18,8 +18,7 @@ require libreoffice-5 autotools [ supported_autoconf=[ 2.5 ] supported_automake=
# When bumping, check download.lst for new tarballs
DOWNLOADS+="
(
- ${LIBRE_DEV_URL}4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz
- ${LIBRE_DEV_URL}ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
+ ${LIBRE_DEV_URL}86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
${LIBRE_DEV_URL}26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
${LIBRE_DEV_URL}a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
${LIBRE_DEV_URL}0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
@@ -31,32 +30,12 @@ DOWNLOADS+="
(
${LIBRE_DEV_URL}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
${LIBRE_DEV_URL}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt
- ${OXYGEN_URL}3ed18025a766f1e955707b969c8113a5-Barcode_1.3.5.0.oxt
- ${OXYGEN_URL}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
- ${OXYGEN_URL}9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
) [[ note = [ extensions
unpackaged because they need java:
Google Docs, Diagram/SmART, LanguageTool, NLPSolver, Validator, Watch Window
] ]]
(
- ${OXYGEN_URL}472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt
- linguas:de? ( ${OXYGEN_URL}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )
- linguas:es? ( ${OXYGEN_URL}4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )
- linguas:fr? ( ${OXYGEN_URL}a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )
- linguas:hu? ( ${OXYGEN_URL}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )
- linguas:it? ( ${OXYGEN_URL}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )
- ) [[ note = [ Sun professional template packages ] ]]
-
- (
- extra-gallery? ( ${OXYGEN_URL}af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip )
- extra-template? ( ${OXYGEN_URL}1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip )
- extra-sample? ( ${OXYGEN_URL}a6bccacf44914969e6e7b2f8faf4132c-OOOP-samples-pack-2.7.0.0.zip )
- ) [[ note = [ extra content
- we don't add fonts, since they are usable by other packages and thus should be in their own exheres
- ] ]]
-
- (
java? ( ${LIBRE_DEV_URL}17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )
) [[ note = [ It only works with hsqldb>=1.8.0.9&<1.8.1 As those versions are rather old I don't
necessarily see a point in unbundling them. ] ]]
@@ -69,9 +48,7 @@ RESTRICT="test"
DEFAULT_SRC_PREPARE_PATCHES+=(
"${FILES}"/${PN}-4.4.0.3-mdds-build.patch
- "${FILES}"/${PN}-4.4.1.2-Fix-kde4-build-on-multiarch.patch
- "${FILES}"/${PN}-5.2.1.2-xmlsec.patch
- "${FILES}"/3e42714c76b1347babfdea0564009d8d82a83af4.patch
+ "${FILES}"/${PN}-5.3.0.3-Fix-kde4-build-on-multiarch.patch
)
src_prepare() {
diff --git a/packages/app-office/libreoffice/libreoffice-5.exlib b/packages/app-office/libreoffice/libreoffice-5.exlib
index 9df3b1d..95be1a2 100644
--- a/packages/app-office/libreoffice/libreoffice-5.exlib
+++ b/packages/app-office/libreoffice/libreoffice-5.exlib
@@ -31,9 +31,6 @@ MYOPTIONS="
dconf [[ description = [ Build support for the dconf configuration system and settings management ] ]]
embedded-opentype [[ description = [ Support eot files, a predecessor to 'Web Open Font Format' (woff) ] ]]
evolution [[ description = [ Build evolution 2 addressbook connectivity ] ]]
- extra-gallery [[ description = [ Install additional clipart galleries ] ]]
- extra-sample [[ description = [ Install additional examples ] ]]
- extra-template [[ description = [ Install additional templates ] ]]
gtk [[ description = [ Build the gtk interface and the system-tray quickstarter ] ]]
gtk3 [[ description = [ Build the gtk3 interface (experimental) ] ]]
help [[ description = [ Build offline help for the selected languages ] ]]
@@ -66,14 +63,13 @@ DEPENDENCIES="
dev-lang/perl:*[>=5.9.3] [[ note = [ for Compress::Zlib ] ]]
dev-libs/libxslt
dev-libs/mdds[>=1.2.0]
- dev-perl/Archive-Zip
dev-util/gperf[>=3.0.0]
sys-devel/bison[>=2.0]
sys-devel/flex[>=2.5.35]
virtual/pkg-config
java? (
dev-java/apache-ant
- virtual/jdk:*[>=1.5]
+ virtual/jdk:*[>=1.6]
)
build+run:
!app-office/openoffice [[
@@ -113,21 +109,24 @@ DEPENDENCIES="
office-libs/libetonyek[>=0.1.5]
office-libs/libfreehand[>=0.1.0]
office-libs/libmspub[>=0.1.0]
- office-libs/libmwaw:0.3[>=0.3.7]
+ office-libs/libmwaw:0.3[>=0.3.9]
office-libs/libodfgen[>=0.1.0]
- office-libs/liborcus[>=0.11.2&<0.12.0]
+ office-libs/liborcus[>=0.12.0]
office-libs/libpagemaker
office-libs/librevenge[>=0.0.1]
+ office-libs/libstaroffice[>=0.0.2]
office-libs/libwpd[>=0.10.0]
office-libs/libwpg[>=0.3.0]
- office-libs/libwps[>=0.4.3]
+ office-libs/libwps[>=0.4.4]
+ office-libs/libzmf
text-libs/libexttextcat[>=3.4.1]
text-libs/liblangtag[>=0.5.5]
x11-apps/xrandr[>=1.2.2]
x11-dri/glu
x11-dri/mesa[>=9.0]
x11-libs/cairo[>=1.2.0][X] [[ note = [ for cairo canvas ] ]]
- x11-libs/harfbuzz[>=0.9.10] [[ note = [ if >=0.9.18, then we also need harfbuzz-icu ] ]]
+ x11-libs/graphite2[>=0.9.3]
+ x11-libs/harfbuzz[>=0.9.42][graphite(-)]
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
@@ -226,21 +225,16 @@ libreoffice-5_src_configure() {
# re-investigate with newer gcc (>=4.8) and libreoffice (>=4.2)
# --enable-pch
--enable-cups
- --enable-ext-barcode
--enable-ext-ct2n
- --enable-ext-hunart
--enable-ext-numbertext
- --enable-ext-typo
--enable-extension-integration
--enable-extension-update
--enable-graphite
--enable-gui
- --enable-hardlink-deliver
--enable-neon
--enable-orcus
--enable-python=system
--enable-release-build
- --enable-symbols
--disable-breakpad
--disable-ccache
--disable-coinmp
@@ -250,6 +244,7 @@ libreoffice-5_src_configure() {
--disable-epm
--disable-fetch-external
--disable-firebird-sdbc
+ --disable-formula-logger
--disable-gltf
--disable-gstreamer-0-10
--disable-mergelibs
@@ -262,11 +257,11 @@ libreoffice-5_src_configure() {
--disable-sal-log
--disable-scripting-beanshell
--disable-scripting-javascript
+ --disable-symbols
--disable-tde
--disable-tdeab
--with-alloc=system
--with-build-version=${PNVR}
- --with-harfbuzz
--with-lang="${LINGUAS//_/-}"
--with-myspell-dicts
--with-package-format=installed
@@ -275,6 +270,7 @@ libreoffice-5_src_configure() {
--with-system-headers
--with-vendor=Exherbo
--without-epm
+ --without-export-validation
--without-fonts
--without-gssapi
--without-junit
@@ -285,7 +281,6 @@ libreoffice-5_src_configure() {
--without-system-coinmp
--without-system-collada2gltf
--without-system-opencollada
- --without-system-graphite
--without-system-libgltf
--without-system-lpsolve
--without-system-mythes
@@ -303,9 +298,6 @@ libreoffice-5_src_configure() {
$(option_enable dconf)
$(option_enable evolution evolution2)
$(option_enable embedded-opentype eot)
- $(option_enable extra-gallery)
- $(option_enable extra-sample)
- $(option_enable extra-template)
$(option_enable gstreamer gstreamer-1-0)
$(option_enable gtk)
$(option_enable gtk systray)
diff --git a/packages/app-office/libreoffice/libreoffice.exlib b/packages/app-office/libreoffice/libreoffice.exlib
index 51a1b7e..e41832d 100644
--- a/packages/app-office/libreoffice/libreoffice.exlib
+++ b/packages/app-office/libreoffice/libreoffice.exlib
@@ -12,9 +12,9 @@ export_exlib_phases pkg_preinst pkg_postinst pkg_postrm
# release, prerelease, old
LIBRE_URLS=(
- http://download.documentfoundation.org/${PN}/src/$(ever range -3)
+ https://download.documentfoundation.org/${PN}/src/$(ever range -3)
http://dev-builds.libreoffice.org/pre-releases/src
- http://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
+ https://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src
)
LIBRE_DEV_URL="http://dev-www.libreoffice.org/src/"
OXYGEN_URL="http://ooo.itc.hu/oxygenoffice/download/libreoffice/"
@@ -30,11 +30,12 @@ DESCRIPTION="
* Draw: A vector graphics editor and diagramming tool
* Math: A tool for creating and editing mathematical formulae
"
-HOMEPAGE="http://www.libreoffice.org/"
+HOMEPAGE="https://www.libreoffice.org"
BUGS_TO="ingmar@exherbo.org moben@exherbo.org"
REMOTE_IDS="freecode:${PN}"
-UPSTREAM_RELEASE_NOTES="http://www.libreoffice.org/download/$(ever replace_all - $(ever range -2))-new-features-and-fixes/"
+
+UPSTREAM_RELEASE_NOTES="${HOMEPAGE}/download/$(ever replace_all - $(ever range -2))-new-features-and-fixes/"
# Can be made MPL-2 with --enable-mpl-subset, as of 4.1
LICENCES="LGPL-3"