haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-06 06:58:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibreOffice: bump version

Browse Source 
* disable for 32bit
This commit is contained in:
Gerasim Troeglazov
2020-10-25 19:54:15 +10:00
parent 64631c5265
commit 34138d5279
4 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app-office/libreoffice/additional-files/libreoffice.iom
View File

Binary file not shown.

47
app-office/libreoffice/additional-files/libreoffice.rdef.in
View File

@@ -17,36 +17,21 @@ resource app_signature "@APP_SIGNATURE@";
resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK"; resource("QT:QPA_FLAGS") "Q_KILL_ON_EXIT|Q_REF_TO_ARGV|Q_REF_TO_FORK";
resource file_types message {
"types" = "application/msword",
"types" = "text/plain",
"types" = "text/rtf",
"types" = "application/x-mswrite",
"types" = "application/vnd.oasis.opendocument.text-master",
"types" = "application/vnd.oasis.opendocument.text",
"types" = "application/vnd.oasis.opendocument.text-template",
"types" = "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
"types" = "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
"types" = "application/vnd.ms-works",
"types" = "application/vnd.wordperfect"
};
resource vector_icon { resource vector_icon {
$"6E6369660705FF030100000101000079030389030300A500020004024D7CE67C" $"6E6369660805FF05BA030100000101000079058805D6020016023C6EE73AEC02"
$"FF00A50005BB080A04222D2254365E36360A0E222D2254365E365A3C5C425A42" $"BC12033D72BD49DD57C47C4A4DFFFF9E05BB080A04222D2254365E36360A0E22"
$"5E5653562D502F50283C222828282F0A0B365F415D415F4D5D5F515C4F5E4D5A" $"2D2254365E365A3C5C425A425E5653562D502F50283C222828282F0A0B365F41"
$"4B6046503D33590A063C5C3C3050285030423642590A0428293C2250293C3108" $"5D415F4D5D5F515C4F5E4D5A4B6046503D33590A063C5C3C3050285030423642"
$"022638323E0802474347530A03363636432E33160A020102000A030103000A04" $"590A0428293C2250293C3108022638323E0802474347530A03363636432E3316"
$"010302C000000000000000004000004B80004000000A050104000A000100000A" $"0A030102000A040103000A05010302C000000000000000004000004B80004000"
$"060107000A0101001001178100040A00010002C000000000000000004000004B" $"000A060104000A000100000A070107000A0201001001178100040A01010002C0"
$"80000000000A06010702C000000000000000004000004B80000000000A010100" $"00000000000000004000004B80000000000A07010702C0000000000000000040"
$"12C000000000000000004000004B800000000001178100040A01010110011782" $"00004B80000000000A02010012C000000000000000004000004B800000000001"
$"00040A01010530202601178100040A01010512BFB66B0000000000004000004B" $"178100040A0201011001178200040A02010530202601178100040A02010512BF"
$"723444800001178100040A01010512BFB66B0000000000004000004B723446C0" $"B66B0000000000004000004B723444800001178100040A02010512BFB66B0000"
$"0001178100040A01010512BFB66B0000000000004000004B7234480000011781" $"000000004000004B723446C00001178100040A02010512BFB66B000000000000"
$"00040A01010512BFB66B0000000000004000004B723448A00001178100040A01" $"4000004B723448000001178100040A02010512BFB66B0000000000004000004B"
$"010530202B01178100040A01010530203001178100040A010105302035011781" $"723448A00001178100040A02010530202B01178100040A020105302030011781"
$"00040A010106301F2001178100040A010106302B1A01178100040A0101063025" $"00040A02010530203501178100040A020106301F2001178100040A020106302B"
$"1D0117810004" $"1A01178100040A02010630251D0117810004"
}; };

30
app-office/libreoffice/libreoffice-7.0.1.2.recipe → app-office/libreoffice/libreoffice-7.0.3.1.recipe
View File

@@ -17,20 +17,26 @@ and Open Source office suite on the market:
HOMEPAGE="https://www.libreoffice.org/" HOMEPAGE="https://www.libreoffice.org/"
COPYRIGHT="2000-2020 LibreOffice contributors" COPYRIGHT="2000-2020 LibreOffice contributors"
LICENSE="MPL v2.0" LICENSE="MPL v2.0"
REVISION="2" REVISION="1"
SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz" SOURCE_URI="https://github.com/LibreOffice/core/archive/libreoffice-$portVersion.tar.gz"
SOURCE_DIR="core-libreoffice-$portVersion" SOURCE_DIR="core-libreoffice-$portVersion"
CHECKSUM_SHA256="1a5451fb26fdeeac130c34278cb80ad2c59c17cf864fe7f21fef635eb3830c75" CHECKSUM_SHA256="a466c53b2d71b482309f88c7b28c1313694c2a9381cb4d03a8584838a219c9d5"
SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz" SOURCE_URI_2="https://github.com/LibreOffice/translations/archive/libreoffice-$portVersion.tar.gz"
CHECKSUM_SHA256_2="38896caccc80ab83a44982b71db29dac52c790444fa179e0ad826e14830e7806" CHECKSUM_SHA256_2="e4c71ac114869d625c75871f697b5431321cf795083a4a97d3a36ab90d35c05f"
SOURCE_DIR_2="translations-libreoffice-$portVersion" SOURCE_DIR_2="translations-libreoffice-$portVersion"
SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz" SOURCE_FILENAME_2="translations-libreoffice-$portVersion.tar.gz"
SOURCE_URI_3="https://dev-www.libreoffice.org/src/dtoa-20180411.tgz#noarchive" SOURCE_URI_3="https://dev-www.libreoffice.org/src/dtoa-20180411.tgz#noarchive"
CHECKSUM_SHA256_3="0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4" CHECKSUM_SHA256_3="0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4"
srcGitRevision4="cd5a5ee2cc0e3b3a62a5827d22035752ec7813a3"
SOURCE_URI_4="https://github.com/threedeyes/LibreOfficeLauncher/archive/$srcGitRevision4.tar.gz"
CHECKSUM_SHA256_4="5314962ca770369398599e175dc2c35c685d3fc968c9894390490c737036e528"
SOURCE_DIR_4="LibreOfficeLauncher-$srcGitRevision4"
SOURCE_FILENAME_4="LibreOfficeLauncher-$srcGitRevision4.tar.gz"
PATCHES="libreoffice-$portVersion.patchset" PATCHES="libreoffice-$portVersion.patchset"
ADDITIONAL_FILES=" ADDITIONAL_FILES="
libreoffice.iom libreoffice.iom
@@ -41,7 +47,7 @@ ADDITIONAL_FILES="
POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh" POST_INSTALL_SCRIPTS="$relativePostInstallDir/create_buildid.sh"
ARCHITECTURES="!x86_gcc2 ?x86 x86_64" ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
if [ "$targetArchitecture" = x86_gcc2 ]; then if [ "$targetArchitecture" = x86_gcc2 ]; then
SECONDARY_ARCHITECTURES="x86" SECONDARY_ARCHITECTURES="!x86"
fi fi
boostMinimumVersion=1.69.0 boostMinimumVersion=1.69.0
@@ -307,6 +313,10 @@ BUILD()
--with-lang="$libreofficeLanguages" --with-lang="$libreofficeLanguages"
make $jobArgs build-nocheck make $jobArgs build-nocheck
pushd $sourceDir4/src
make
popd
} }
INSTALL() INSTALL()
@@ -315,10 +325,13 @@ INSTALL()
mkdir -p $appDir mkdir -p $appDir
cp -r instdir/* $appDir cp -r instdir/* $appDir
mv $appDir/program/soffice.bin $appDir/program/LibreOffice mv $appDir/program/soffice.bin $appDir/program/LibreOffice
mv $sourceDir4/src/LibreOffice\ {Calc,Database,Draw,Impress,Math,Writer} $appDir
# make sure we do not copy default profile # make sure we do not copy default profile
rm -rf $appDir/user $appDir/share/xdg rm -rf $appDir/user $appDir/share/xdg
mkdir -p "$dataDir/deskbar/menu/Applications/LibreOffice"
packageEntries galleries \ packageEntries galleries \
$appDir/share/gallery $appDir/presets/gallery $appDir/share/gallery $appDir/presets/gallery
@@ -365,5 +378,12 @@ INSTALL()
$portDir/additional-files/libreoffice.rdef.in > libreoffice.rdef $portDir/additional-files/libreoffice.rdef.in > libreoffice.rdef
addResourcesToBinaries libreoffice.rdef $appDir/program/LibreOffice addResourcesToBinaries libreoffice.rdef $appDir/program/LibreOffice
addAppDeskbarSymlink $appDir/program/LibreOffice
addAppDeskbarSymlink $appDir/program/LibreOffice "LibreOffice/LibreOffice"
addAppDeskbarSymlink "$appDir/LibreOffice Calc" "LibreOffice/LibreOffice Calc"
addAppDeskbarSymlink "$appDir/LibreOffice Database" "LibreOffice/LibreOffice Database"
addAppDeskbarSymlink "$appDir/LibreOffice Draw" "LibreOffice/LibreOffice Draw"
addAppDeskbarSymlink "$appDir/LibreOffice Impress" "LibreOffice/LibreOffice Impress"
addAppDeskbarSymlink "$appDir/LibreOffice Math" "LibreOffice/LibreOffice Math"
addAppDeskbarSymlink "$appDir/LibreOffice Writer" "LibreOffice/LibreOffice Writer"
} }

51
app-office/libreoffice/patches/libreoffice-7.0.1.2.patchset → app-office/libreoffice/patches/libreoffice-7.0.3.1.patchset
View File

@@ -1,4 +1,4 @@
From e37b69bec65d206fc8bdf3ec8f567d74c6007498 Mon Sep 17 00:00:00 2001 From 9748817ff819b25ecb8eced69237e5b278721508 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 15 Feb 2020 14:52:59 +0300 Date: Sat, 15 Feb 2020 14:52:59 +0300
Subject: Make Elementary the default on Haiku Subject: Make Elementary the default on Haiku
@@ -22,7 +22,7 @@ index e98d636..f154f7c 100644
2.28.0 2.28.0
From 50339c962f784cb1cf9907b83d17a5f39c5c7cbb Mon Sep 17 00:00:00 2001 From 91225858d2661f8da5ac565cc2c1f0327466b116 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 7 Aug 2020 12:14:40 +0300 Date: Fri, 7 Aug 2020 12:14:40 +0300
Subject: Show used vcl backend in About window on Haiku Subject: Show used vcl backend in About window on Haiku
@@ -45,7 +45,7 @@ index faf2d6f..684a925 100644
2.28.0 2.28.0
From f5b956b120f4b6abafe6e0c48d99fc2493902442 Mon Sep 17 00:00:00 2001 From 50ad745ee8cfc2049b0bd8f919c2b7ab2a598a5e Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 24 Oct 2018 17:01:34 +0300 Date: Wed, 24 Oct 2018 17:01:34 +0300
Subject: Identify Haiku in about window Subject: Identify Haiku in about window
@@ -68,7 +68,7 @@ index b661163..329265a 100644
2.28.0 2.28.0
From 8378a870dbddf61c75f0f7a39223085ce3db60ab Mon Sep 17 00:00:00 2001 From fd9509c486889dc97f658b68d40009d6438e784d Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 15 Feb 2020 15:04:53 +0300 Date: Sat, 15 Feb 2020 15:04:53 +0300
Subject: Implement ShellExec on Haiku Subject: Implement ShellExec on Haiku
@@ -92,7 +92,7 @@ index 58c5ef4..93f7f7b 100644
2.28.0 2.28.0
From 0fa91ab00f2a6c5f257f96fe682237799b3ba209 Mon Sep 17 00:00:00 2001 From 83e4857c2e719b9d01755a584577804595243045 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 20 Jul 2019 01:18:50 +0300 Date: Sat, 20 Jul 2019 01:18:50 +0300
Subject: Comment out linking with pthread Subject: Comment out linking with pthread
@@ -119,7 +119,7 @@ index 6abfb75..69b8d0e 100644
2.28.0 2.28.0
From c50439ee9d08097ba112eddcb978d40e96c3923f Mon Sep 17 00:00:00 2001 From f89aee806e71b4161b00fdb310ddc316267788ed Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 11 Aug 2019 11:46:49 +1000 Date: Sun, 11 Aug 2019 11:46:49 +1000
Subject: Workaround for ambiguous methods Subject: Workaround for ambiguous methods
@@ -164,7 +164,7 @@ index a4c57ca..bbe89ce 100644
2.28.0 2.28.0
From 123dd581edb1177fea906a0ff03299c2caefd743 Mon Sep 17 00:00:00 2001 From aaa099840c8ff36085f228c4d654d74d82f9c841 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 11 Aug 2019 11:47:40 +1000 Date: Sun, 11 Aug 2019 11:47:40 +1000
Subject: Add XP_HAIKU defs for xmlsec Subject: Add XP_HAIKU defs for xmlsec
@@ -208,7 +208,7 @@ index bd2cb6a..9d6a90c 100644
2.28.0 2.28.0
From a2caa65906da40f2e482d2e443150957f4740179 Mon Sep 17 00:00:00 2001 From 34cbded565aae3b4ae2799eca45679b22d6dcb96 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 7 Aug 2020 12:37:45 +0300 Date: Fri, 7 Aug 2020 12:37:45 +0300
Subject: Cast to boolean Subject: Cast to boolean
@@ -299,7 +299,7 @@ index c1fbb53..4dddb21 100644
2.28.0 2.28.0
From 348adbe95eab841ea6cc52becacf424d9d90d6d6 Mon Sep 17 00:00:00 2001 From b81ec6d5c19132723d4cc48c58892f6e83dd0ea7 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net> From: Sergei Reznikov <diver@gelios.net>
Date: Fri, 7 Aug 2020 12:47:56 +0300 Date: Fri, 7 Aug 2020 12:47:56 +0300
Subject: Revert fstack-protector check removal in Subject: Revert fstack-protector check removal in
@@ -307,7 +307,7 @@ Subject: Revert fstack-protector check removal in
diff --git a/config_host.mk.in b/config_host.mk.in diff --git a/config_host.mk.in b/config_host.mk.in
index a14fb82..80744be 100644 index dc3da7e..3a8a222 100644
--- a/config_host.mk.in --- a/config_host.mk.in
+++ b/config_host.mk.in +++ b/config_host.mk.in
@@ -270,6 +270,7 @@ export HAMCREST_JAR=@HAMCREST_JAR@ @@ -270,6 +270,7 @@ export HAMCREST_JAR=@HAMCREST_JAR@
@@ -319,10 +319,10 @@ index a14fb82..80744be 100644
export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@ export HAVE_GCC_FNO_ENFORCE_EH_SPECS=@HAVE_GCC_FNO_ENFORCE_EH_SPECS@
export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@ export HAVE_GCC_FNO_SIZED_DEALLOCATION=@HAVE_GCC_FNO_SIZED_DEALLOCATION@
diff --git a/configure.ac b/configure.ac diff --git a/configure.ac b/configure.ac
index ada4e42..014f6f5 100644 index 5a14369..5044e61 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -6294,6 +6294,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then @@ -6298,6 +6298,17 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
@@ -340,7 +340,7 @@ index ada4e42..014f6f5 100644
AC_MSG_CHECKING([whether $CC_BASE supports atomic functions]) AC_MSG_CHECKING([whether $CC_BASE supports atomic functions])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[
int v = 0; int v = 0;
@@ -6445,6 +6456,7 @@ AC_LANG_POP([C++]) @@ -6449,6 +6460,7 @@ AC_LANG_POP([C++])
fi fi
AC_SUBST(HAVE_GCC_AVX) AC_SUBST(HAVE_GCC_AVX)
@@ -384,11 +384,12 @@ index 1707a74..901f0e6 100644
2.28.0 2.28.0
From 0fe9f6c5f6e1df6764d2fc8ec89164e3e9b523cb Mon Sep 17 00:00:00 2001 From 287897fc23816f84635c2b95329713c2e8d64cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com> From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Mon, 20 Jul 2020 09:52:27 +0100 Date: Mon, 20 Jul 2020 09:52:27 +0100
Subject: fix some warnings with --with-tls=openssl Subject: fix some warnings with --with-tls=openssl
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index ff11ebb..77b6f8c 100644 index ff11ebb..77b6f8c 100644
--- a/oox/source/crypto/CryptTools.cxx --- a/oox/source/crypto/CryptTools.cxx
@@ -504,3 +505,25 @@ index ff11ebb..77b6f8c 100644
-- --
2.28.0 2.28.0
From 68bae1356f5c0d9f7ad955ddb42932a8f4708fcf Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Oct 2020 18:51:26 +1000
Subject: Fix build
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index 3066c4d..93c88d6 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -218,7 +218,6 @@ size_t RenderPDFBitmaps(const void* pBuffer, int nSize, std::vector<Bitmap>& rBi
(void)rBitmaps;
(void)nFirstPage;
(void)nPages;
- (void)fResolutionDPI;
return 0;
#endif // HAVE_FEATURE_PDFIUM
}
--
2.28.0