[arch-commits] Commit in libreoffice-fresh/repos/extra-x86_64 (15 files)
Andreas Radke
andyrtr at gemini.archlinux.org
Tue Mar 1 11:08:26 UTC 2022
Date: Tuesday, March 1, 2022 @ 11:08:26
Author: andyrtr
Revision: 438261
archrelease: copy trunk to extra-x86_64
Added:
libreoffice-fresh/repos/extra-x86_64/0001_drop_the_SolarMutex_before_QApplication.patch
(from rev 438260, libreoffice-fresh/trunk/0001_drop_the_SolarMutex_before_QApplication.patch)
libreoffice-fresh/repos/extra-x86_64/0002_update_kf5_include_lib_check.patch
(from rev 438260, libreoffice-fresh/trunk/0002_update_kf5_include_lib_check.patch)
libreoffice-fresh/repos/extra-x86_64/0003_tdf147611_fix_indices.patch
(from rev 438260, libreoffice-fresh/trunk/0003_tdf147611_fix_indices.patch)
libreoffice-fresh/repos/extra-x86_64/PKGBUILD
(from rev 438260, libreoffice-fresh/trunk/PKGBUILD)
libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.csh
(from rev 438260, libreoffice-fresh/trunk/libreoffice-fresh.csh)
libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.sh
(from rev 438260, libreoffice-fresh/trunk/libreoffice-fresh.sh)
libreoffice-fresh/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
(from rev 438260, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff)
libreoffice-fresh/repos/extra-x86_64/soffice-template.desktop.in
(from rev 438260, libreoffice-fresh/trunk/soffice-template.desktop.in)
Deleted:
libreoffice-fresh/repos/extra-x86_64/0001_drop_the_SolarMutex_before_QApplication.patch
libreoffice-fresh/repos/extra-x86_64/0002_update_kf5_include_lib_check.patch
libreoffice-fresh/repos/extra-x86_64/PKGBUILD
libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.csh
libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.sh
libreoffice-fresh/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff
libreoffice-fresh/repos/extra-x86_64/soffice-template.desktop.in
------------------------------------------------------+
0001_drop_the_SolarMutex_before_QApplication.patch | 152 +--
0002_update_kf5_include_lib_check.patch | 112 +-
0003_tdf147611_fix_indices.patch | 155 +++
PKGBUILD | 804 ++++++++---------
libreoffice-fresh.csh | 14
libreoffice-fresh.sh | 14
make-pyuno-work-with-system-wide-module-install.diff | 36
soffice-template.desktop.in | 14
8 files changed, 731 insertions(+), 570 deletions(-)
Deleted: 0001_drop_the_SolarMutex_before_QApplication.patch
===================================================================
--- 0001_drop_the_SolarMutex_before_QApplication.patch 2022-03-01 11:08:05 UTC (rev 438260)
+++ 0001_drop_the_SolarMutex_before_QApplication.patch 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,76 +0,0 @@
-From db43e8a2a02adaa3571137b82855c01fad4c2534 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
-Date: Wed, 2 Feb 2022 16:21:43 +0000
-Subject: rhbz#2047319 drop the SolarMutex before QApplication::init()
-
-https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
-
-reproducible with with qt5-qtwayland-5.15.2-17.fc35.x86_64 and
-export OOO_FORCE_DESKTOP=plasma5
-export SAL_USE_VCLPLUGIN=gtk3
-
-Change-Id: Icdf6b8709865c723c266e6400169b33639a1b0e4
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129428
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
----
- shell/Library_kf5be.mk | 1 +
- shell/source/backends/kf5be/kf5backend.cxx | 23 +++++++++++++++--------
- 2 files changed, 16 insertions(+), 8 deletions(-)
-
-diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk
-index 628145176e0f..157f8b9836f8 100644
---- a/shell/Library_kf5be.mk
-+++ b/shell/Library_kf5be.mk
-@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\
- cppu \
- cppuhelper \
- sal \
-+ vcl \
- ))
-
- $(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1))
-diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
-index e9e10e60fd27..2b41414c54cd 100644
---- a/shell/source/backends/kf5be/kf5backend.cxx
-+++ b/shell/source/backends/kf5be/kf5backend.cxx
-@@ -41,6 +41,7 @@
- #include <rtl/ustring.hxx>
- #include <sal/types.h>
- #include <uno/current_context.hxx>
-+#include <vcl/svapp.hxx>
-
- #include <osl/process.h>
- #include <osl/thread.h>
-@@ -172,14 +173,20 @@ void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings
- unsetenv("SESSION_MANAGER");
- }
-
-- std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
-- QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
-- for (int i = 0; i < nFakeArgc; ++i)
-- free(pFakeArgv[i]);
-- delete[] pFakeArgv;
-- });
--
-- readKDESettings(rSettings);
-+ {
-+ // rhbz#2047319 drop the SolarMutex during the execution of QApplication::init()
-+ // https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
-+ SolarMutexReleaser aReleaser; // rhbz#2047319 drop the SolarMutex during the execution
-+
-+ std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
-+ QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
-+ for (int i = 0; i < nFakeArgc; ++i)
-+ free(pFakeArgv[i]);
-+ delete[] pFakeArgv;
-+ });
-+
-+ readKDESettings(rSettings);
-+ }
-
- if (session_manager != nullptr)
- {
---
-cgit v1.2.1
-
Copied: libreoffice-fresh/repos/extra-x86_64/0001_drop_the_SolarMutex_before_QApplication.patch (from rev 438260, libreoffice-fresh/trunk/0001_drop_the_SolarMutex_before_QApplication.patch)
===================================================================
--- 0001_drop_the_SolarMutex_before_QApplication.patch (rev 0)
+++ 0001_drop_the_SolarMutex_before_QApplication.patch 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,76 @@
+From db43e8a2a02adaa3571137b82855c01fad4c2534 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 2 Feb 2022 16:21:43 +0000
+Subject: rhbz#2047319 drop the SolarMutex before QApplication::init()
+
+https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
+
+reproducible with with qt5-qtwayland-5.15.2-17.fc35.x86_64 and
+export OOO_FORCE_DESKTOP=plasma5
+export SAL_USE_VCLPLUGIN=gtk3
+
+Change-Id: Icdf6b8709865c723c266e6400169b33639a1b0e4
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129428
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
+---
+ shell/Library_kf5be.mk | 1 +
+ shell/source/backends/kf5be/kf5backend.cxx | 23 +++++++++++++++--------
+ 2 files changed, 16 insertions(+), 8 deletions(-)
+
+diff --git a/shell/Library_kf5be.mk b/shell/Library_kf5be.mk
+index 628145176e0f..157f8b9836f8 100644
+--- a/shell/Library_kf5be.mk
++++ b/shell/Library_kf5be.mk
+@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_libraries,kf5be1,\
+ cppu \
+ cppuhelper \
+ sal \
++ vcl \
+ ))
+
+ $(eval $(call gb_Library_set_componentfile,kf5be1,shell/source/backends/kf5be/kf5be1))
+diff --git a/shell/source/backends/kf5be/kf5backend.cxx b/shell/source/backends/kf5be/kf5backend.cxx
+index e9e10e60fd27..2b41414c54cd 100644
+--- a/shell/source/backends/kf5be/kf5backend.cxx
++++ b/shell/source/backends/kf5be/kf5backend.cxx
+@@ -41,6 +41,7 @@
+ #include <rtl/ustring.hxx>
+ #include <sal/types.h>
+ #include <uno/current_context.hxx>
++#include <vcl/svapp.hxx>
+
+ #include <osl/process.h>
+ #include <osl/thread.h>
+@@ -172,14 +173,20 @@ void initQApp(std::map<OUString, css::beans::Optional<css::uno::Any>>& rSettings
+ unsetenv("SESSION_MANAGER");
+ }
+
+- std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
+- QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
+- for (int i = 0; i < nFakeArgc; ++i)
+- free(pFakeArgv[i]);
+- delete[] pFakeArgv;
+- });
+-
+- readKDESettings(rSettings);
++ {
++ // rhbz#2047319 drop the SolarMutex during the execution of QApplication::init()
++ // https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/24#note_383915
++ SolarMutexReleaser aReleaser; // rhbz#2047319 drop the SolarMutex during the execution
++
++ std::unique_ptr<QApplication> app(new QApplication(nFakeArgc, pFakeArgv));
++ QObject::connect(app.get(), &QObject::destroyed, app.get(), [nFakeArgc, pFakeArgv]() {
++ for (int i = 0; i < nFakeArgc; ++i)
++ free(pFakeArgv[i]);
++ delete[] pFakeArgv;
++ });
++
++ readKDESettings(rSettings);
++ }
+
+ if (session_manager != nullptr)
+ {
+--
+cgit v1.2.1
+
Deleted: 0002_update_kf5_include_lib_check.patch
===================================================================
--- 0002_update_kf5_include_lib_check.patch 2022-03-01 11:08:05 UTC (rev 438260)
+++ 0002_update_kf5_include_lib_check.patch 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,56 +0,0 @@
-From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
-From: Michael Weghorn <m.weghorn at posteo.de>
-Date: Wed, 16 Feb 2022 13:38:47 +0100
-Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
-
-The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
-subdirectory in kcoreaddons commit
-
- commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
- Author: Ahmad Samir <a.samirh78 at gmail.com>
- Date: Sat Jan 15 14:14:13 2022 +0200
-
- Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
-
- Instead of /usr/include/KF5/kcoreaddons_version.h.
-
- For more details see:
- https://invent.kde.org/frameworks/kservice/-/merge_requests/79
-
- GIT_SILENT
-
-Adapt the KF5 check to check for the 'KFileWidget' header and
-the 'libKF5KIOFileWidgets.so' library instead.
-This is more exact anyway, since we require KIOFileWidgets,
-and the previous check didn't ensure that.
-(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
-configure would previously pass, but the build fail.)
-
-[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
-
-Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
-Tested-by: Jenkins
-Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6acb3107cea3..4e84f9a33980 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13017,8 +13017,8 @@ then
- kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
- fi
-
-- kf5_test_include="KF5/kcoreaddons_version.h"
-- kf5_test_library="libKF5CoreAddons.so"
-+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
-+ kf5_test_library="libKF5KIOFileWidgets.so"
- kf5_libdirs="$qt5_libdir $kf5_libdirs"
-
- dnl kf5 KDE4 support compatibility installed
---
-cgit v1.2.1
-
Copied: libreoffice-fresh/repos/extra-x86_64/0002_update_kf5_include_lib_check.patch (from rev 438260, libreoffice-fresh/trunk/0002_update_kf5_include_lib_check.patch)
===================================================================
--- 0002_update_kf5_include_lib_check.patch (rev 0)
+++ 0002_update_kf5_include_lib_check.patch 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,56 @@
+From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001
+From: Michael Weghorn <m.weghorn at posteo.de>
+Date: Wed, 16 Feb 2022 13:38:47 +0100
+Subject: configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
+
+The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
+subdirectory in kcoreaddons commit
+
+ commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
+ Author: Ahmad Samir <a.samirh78 at gmail.com>
+ Date: Sat Jan 15 14:14:13 2022 +0200
+
+ Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
+
+ Instead of /usr/include/KF5/kcoreaddons_version.h.
+
+ For more details see:
+ https://invent.kde.org/frameworks/kservice/-/merge_requests/79
+
+ GIT_SILENT
+
+Adapt the KF5 check to check for the 'KFileWidget' header and
+the 'libKF5KIOFileWidgets.so' library instead.
+This is more exact anyway, since we require KIOFileWidgets,
+and the previous check didn't ensure that.
+(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
+configure would previously pass, but the build fail.)
+
+[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
+
+Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
+Tested-by: Jenkins
+Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6acb3107cea3..4e84f9a33980 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13017,8 +13017,8 @@ then
+ kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel"
+ fi
+
+- kf5_test_include="KF5/kcoreaddons_version.h"
+- kf5_test_library="libKF5CoreAddons.so"
++ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
++ kf5_test_library="libKF5KIOFileWidgets.so"
+ kf5_libdirs="$qt5_libdir $kf5_libdirs"
+
+ dnl kf5 KDE4 support compatibility installed
+--
+cgit v1.2.1
+
Copied: libreoffice-fresh/repos/extra-x86_64/0003_tdf147611_fix_indices.patch (from rev 438260, libreoffice-fresh/trunk/0003_tdf147611_fix_indices.patch)
===================================================================
--- 0003_tdf147611_fix_indices.patch (rev 0)
+++ 0003_tdf147611_fix_indices.patch 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,155 @@
+From e85d2140ae5e9a611754c29aa4e5cdb6ad7fcab0 Mon Sep 17 00:00:00 2001
+From: Mike Kaganski <mike.kaganski at collabora.com>
+Date: Wed, 23 Feb 2022 18:14:38 +0300
+Subject: tdf#147611: fix indices
+
+The maKeyState vector in ScSortParam is initialized with three elements,
+and they are never removed. The code in ScVbaRange::Sort incorrectly used
+1-based indices into that vector.
+
+This was broken since commit a02b445c39d969fedc554fc2c500b88a27a13906
+ Author: Albert Thuswaldner <albert.thuswaldner at gmail.com>
+ Date: Tue Mar 20 19:38:29 2012 +0100
+
+ fdo#45747 remove the limitation to 3 sort entries in calc part1
+
+It was fixed in commit 568d3912bf8ced76ecb9506bccc3bd361daba082
+ Author: Kohei Yoshida <kohei.yoshida at gmail.com>
+ Date: Wed Apr 04 15:30:35 2012 -0400
+
+ Cleanup. ScPivot(Collection) is no more.
+
+but was restored by commit 3e887edcaacc5b0f5e35d682a259124648e84229
+ Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
+ Date: Thu Apr 5 05:05:40 2012 +0200
+
+ Revert "Cleanup. ScPivot(Collection) is no more."
+
+Change-Id: I009252e794c9365f0aef8a61daf9cbd40eca8b75
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130441
+Tested-by: Jenkins
+Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
+Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130476
+Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
+---
+ sc/qa/extras/macros-test.cxx | 64 +++++++++++++++++++++++++++++++++++++++++++
+ sc/source/ui/vba/vbarange.cxx | 6 ++--
+ 2 files changed, 67 insertions(+), 3 deletions(-)
+
+diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
+index 559dd903e4eb..cd4d15f16e8d 100644
+--- a/sc/qa/extras/macros-test.cxx
++++ b/sc/qa/extras/macros-test.cxx
+@@ -22,6 +22,7 @@
+ #include <document.hxx>
+ #include <attrib.hxx>
+ #include <scitems.hxx>
++#include <sortparam.hxx>
+
+ #include <com/sun/star/sheet/XSpreadsheet.hpp>
+
+@@ -74,6 +75,7 @@ public:
+ void testTdf130307();
+ void testTdf146742();
+ void testMacroButtonFormControlXlsxExport();
++ void testVbaRangeSort();
+
+ CPPUNIT_TEST_SUITE(ScMacrosTest);
+ CPPUNIT_TEST(testStarBasic);
+@@ -107,6 +109,7 @@ public:
+ CPPUNIT_TEST(testTdf130307);
+ CPPUNIT_TEST(testTdf146742);
+ CPPUNIT_TEST(testMacroButtonFormControlXlsxExport);
++ CPPUNIT_TEST(testVbaRangeSort);
+
+ CPPUNIT_TEST_SUITE_END();
+ };
+@@ -1333,6 +1336,67 @@ void ScMacrosTest::testTdf90278()
+ xDocSh->DoClose();
+ }
+
++void ScMacrosTest::testVbaRangeSort()
++{
++ auto xComponent = loadFromDesktop("private:factory/scalc");
++
++ css::uno::Reference<css::document::XEmbeddedScripts> xDocScr(xComponent, UNO_QUERY_THROW);
++ auto xLibs = xDocScr->getBasicLibraries();
++ auto xLibrary = xLibs->createLibrary("TestLibrary");
++ xLibrary->insertByName(
++ "TestModule",
++ uno::Any(OUString("Option VBASupport 1\n"
++ "Sub TestRangeSort\n"
++ " Range(Cells(1, 1), Cells(3, 1)).Select\n"
++ " Selection.Sort Key1:=Range(\"A1\"), Header:=False\n"
++ "End Sub\n")));
++
++ Any aRet;
++ Sequence<sal_Int16> aOutParamIndex;
++ Sequence<Any> aOutParam;
++
++ SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(xComponent);
++ ScDocShell* pDocSh = static_cast<ScDocShell*>(pFoundShell);
++ CPPUNIT_ASSERT(pDocSh);
++ ScDocument& rDoc = pDocSh->GetDocument();
++
++ rDoc.SetValue(ScAddress(0, 0, 0), 1.0);
++ rDoc.SetValue(ScAddress(0, 1, 0), 0.5);
++ rDoc.SetValue(ScAddress(0, 2, 0), 2.0);
++
++ // Without the fix in place, this call would have crashed in debug builds with failed assertion
++ ErrCode result = SfxObjectShell::CallXScript(
++ xComponent,
++ "vnd.sun.Star.script:TestLibrary.TestModule.TestRangeSort?language=Basic&location=document",
++ {}, aRet, aOutParamIndex, aOutParam);
++ CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, result);
++
++ CPPUNIT_ASSERT_EQUAL(0.5, rDoc.GetValue(ScAddress(0, 0, 0)));
++ CPPUNIT_ASSERT_EQUAL(1.0, rDoc.GetValue(ScAddress(0, 1, 0)));
++ CPPUNIT_ASSERT_EQUAL(2.0, rDoc.GetValue(ScAddress(0, 2, 0)));
++
++ // Change sheet's first param sorting order
++ ScSortParam aParam;
++ rDoc.GetSortParam(aParam, 0);
++ aParam.maKeyState[0].bAscending = false;
++ rDoc.SetSortParam(aParam, 0);
++
++ result = SfxObjectShell::CallXScript(
++ xComponent,
++ "vnd.sun.Star.script:TestLibrary.TestModule.TestRangeSort?language=Basic&location=document",
++ {}, aRet, aOutParamIndex, aOutParam);
++ CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, result);
++
++ // Without the fix in place, this test would have failed in non-debug builds with
++ // - Expected: 2
++ // - Actual : 0.5
++ CPPUNIT_ASSERT_EQUAL(2.0, rDoc.GetValue(ScAddress(0, 0, 0)));
++ CPPUNIT_ASSERT_EQUAL(1.0, rDoc.GetValue(ScAddress(0, 1, 0)));
++ CPPUNIT_ASSERT_EQUAL(0.5, rDoc.GetValue(ScAddress(0, 2, 0)));
++
++ pDocSh->DoClose();
++}
++
+ ScMacrosTest::ScMacrosTest()
+ : UnoApiTest("/sc/qa/extras/testdocuments")
+ {
+diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
+index 75ae115ce9d4..28019615eb9d 100644
+--- a/sc/source/ui/vba/vbarange.cxx
++++ b/sc/source/ui/vba/vbarange.cxx
+@@ -3412,9 +3412,9 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& Order1, const uno::Any&
+
+ // set up defaults
+
+- sal_Int16 nOrder1 = aSortParam.maKeyState[1].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+- sal_Int16 nOrder2 = aSortParam.maKeyState[2].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+- sal_Int16 nOrder3 = aSortParam.maKeyState[3].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++ sal_Int16 nOrder1 = aSortParam.maKeyState[0].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++ sal_Int16 nOrder2 = aSortParam.maKeyState[1].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
++ sal_Int16 nOrder3 = aSortParam.maKeyState[2].bAscending ? excel::XlSortOrder::xlAscending : excel::XlSortOrder::xlDescending;
+
+ sal_Int16 nCustom = aSortParam.nUserIndex;
+ sal_Int16 nSortMethod = excel::XlSortMethod::xlPinYin;
+--
+cgit v1.2.1
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-01 11:08:05 UTC (rev 438260)
+++ PKGBUILD 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,399 +0,0 @@
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-
-# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-# Note: These are for Arch Linux use ONLY. For your own distribution, please
-# get your own set of keys. Feel free to contact foutrelis at archlinux.org for
-# more information.
-_google_default_client_id=413772536636.apps.googleusercontent.com
-_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
-
-pkgbase=libreoffice-fresh
-pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=7.3.0.3
-pkgver=7.3.0
-pkgrel=5
-arch=('x86_64')
-license=('LGPL3')
-url="https://www.libreoffice.org/"
-makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
- 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
- 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
- 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
- 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'gst-plugins-base-libs'
- 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
- 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
- 'junit' 'libmythes' 'libwpg' 'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
- 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
- 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
- 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
-# 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
- 'libexttextcat' 'gobject-introspection' # 'libfbclient'
- 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
- 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
- 'libcuckoo' 'abseil-cpp' 'zxing-cpp' 'clang'
- 'libffi' 'box2d' 'git'
-)
-options=('!lto') # using --enable-lto (for parallel link-time optimization)
-_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="https://dev-www.libreoffice.org/src"
-_additional_source_url2="https://dev-www.libreoffice.org/extern"
-source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
- ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
- ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- ${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2
- ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_additional_source_url}/pdfium-4699.tar.bz2
- ${_additional_source_url}/dtoa-20180411.tgz
- ${_additional_source_url}/lxml-4.1.1.tgz
- ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
- ${_additional_source_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
- ${_additional_source_url}/libcmis-0.5.2.tar.xz
- ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
- ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
- ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
- ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- make-pyuno-work-with-system-wide-module-install.diff
- 0001_drop_the_SolarMutex_before_QApplication.patch
- 0002_update_kf5_include_lib_check.patch
- soffice-template.desktop.in
- libreoffice-fresh.sh libreoffice-fresh.csh)
-noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
- language-subtag-registry-2021-03-05.tar.bz2
- 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- pdfium-4699.tar.bz2
- dtoa-20180411.tgz
- lxml-4.1.1.tgz
- Firebird-3.0.7.33374-0.tar.bz2
- #zxing-cpp-1.1.1.tar.gz
- skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
- libcmis-0.5.2.tar.xz
- 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
- odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
- f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll
-)
-validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
-sha256sums=('98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25'
- 'SKIP'
- '53b091291b1a857e98db9332386322ffa1410932b53215fa8eecb7acd96d931b'
- 'SKIP'
- '43e9d768af1a74242455741670a70bd9f3a1e01ec4599caddb16e0825614e7fe'
- 'SKIP'
- '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
- '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
- '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
- '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
- 'ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a'
- 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
- '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
- '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
- 'ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf'
- '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4'
- '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
- 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
- '97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177'
- 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
- 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
- '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
- 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
- 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
- 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
- '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
- '1cc5aeac9b8e91786701727d97b58039afc3db3dbc7977a3651d3263240798b3'
- 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
- 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
- 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
-
-prepare() {
-
- cd libreoffice-$_LOver
-
- # move external sources into place
- mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
- for source in "${noextract[@]}"; do
- ln -s "${srcdir}"/$source .
- done
- popd
-
- # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
- # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
-
- # fix not upstreamable pyuno paths - FS#54250
- patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
-
- # fix crash on start - FS#73471
- patch -Np1 -i "${srcdir}"/0001_drop_the_SolarMutex_before_QApplication.patch
-
- # fix kf5 chances
- # https://cgit.freedesktop.org/libreoffice/core/commit/?id=5fd5e42bf28a7910321c6b6d76257e7386839fbc
- patch -Np1 -i "${srcdir}"/0002_update_kf5_include_lib_check.patch
-
- #use the CFLAGS but remove the LibO overridden ones
- for i in $CFLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
- done
-}
-
-build() {
- cd libreoffice-$_LOver
-
- # strip -s from Makeflags in case you use it to shorten build logs
- _MAKEFLAGS=${MAKEFLAGS/-s/}
-
- # http://site.icu-project.org/download/61#TOC-Migration-Issues
- CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
-
- ./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \
- --with-vendor="Arch Linux" \
- --enable-split-app-modules \
- --with-parallelism=${_MAKEFLAGS/-j/} \
- --with-external-tar="${srcdir}/ext_sources" \
- --disable-fetch-external \
- --enable-release-build \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib --mandir=/usr/share/man \
- --with-lang="" \
- --with-help=html \
- --disable-avahi \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --enable-gtk3-kde5 \
- --enable-kf5 \
- --enable-qt5 \
- --enable-gtk3 \
- --enable-introspection \
- --enable-lto \
- --enable-openssl \
- --enable-odk\
- --enable-python=system \
- --enable-scripting-beanshell \
- --enable-scripting-javascript \
- --disable-dconf \
- --disable-report-builder \
- --enable-ext-wiki-publisher \
- --enable-ext-nlpsolver \
- --without-fonts\
- --with-system-apr \
- --with-system-libcdr \
- --with-system-mdds\
- --without-myspell-dicts \
- --with-system-libvisio \
- --without-system-libcmis \
- --with-system-libmspub \
- --with-system-libexttextcat \
- --with-system-orcus \
- --with-system-liblangtag \
- --with-system-libodfgen \
- --with-system-libmwaw \
- --with-system-libetonyek \
- --with-system-libfreehand \
- --without-system-firebird \
- --with-system-zxing \
- --with-system-libtommath \
- --with-system-libatomic-ops \
- --with-system-libebook \
- --with-system-libabw \
- --with-system-coinmp \
- --with-system-dicts \
- --with-external-dict-dir=/usr/share/hunspell \
- --with-external-hyph-dir=/usr/share/hyphen \
- --with-external-thes-dir=/usr/share/mythes \
- --with-system-beanshell \
- --with-system-cppunit\
- --with-system-graphite\
- --with-system-glm \
- --with-system-libnumbertext \
- --with-system-libwpg \
- --with-system-libwps \
- --with-system-redland\
- --with-system-libzmf \
- --with-system-gpgmepp \
- --with-system-libstaroffice \
- --with-system-cuckoo \
- --with-system-serf \
- --with-jdk-home="/usr/lib/jvm/default" \
- --with-ant-home="/usr/share/ant"\
- --with-system-boost\
- --with-system-icu \
- --with-system-cairo \
- --with-system-libs \
- --with-system-mythes \
- --with-system-headers \
- --without-system-hsqldb \
- --with-system-clucene \
- --with-gdrive-client-id=${_google_default_client_id} \
- --with-gdrive-client-secret=${_google_default_client_secret} \
- --disable-dependency-tracking
-
- touch src.downloaded
- make build-nocheck
-
- mkdir "${srcdir}"/fakeinstall
- make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
-}
-
-#check() {
-# cd "${srcdir}"/build
-# make check
-#}
-
-package_libreoffice-fresh-sdk() {
- pkgdesc="Software Development Kit for LibreOffice Fresh"
- depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- provides=('libreoffice-sdk')
- conflicts=('libreoffice-still-sdk')
-
- for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
- install -dm755 "${pkgdir}"/${dir/\%dir/}
- done
-
- for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
- dirname=$(dirname $file)
- [[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
- mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
- done
-
- # fix environment path to keep compatibility with other java-environments
- sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
- "${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-
- # fix permissions
- find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
-
- # add LibreOfficeKit headers; FS#48066
- install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
- install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
-}
-
-package_libreoffice-fresh() {
- pkgdesc="LibreOffice branch which contains new features and program enhancements"
- depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
- 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
- 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
- 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
- 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
- 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
- #'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
- 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient'
- 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
- 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
- 'zxing-cpp'
- 'xdg-utils')
- optdepends=('java-runtime: adds java support'
- 'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'libmythes: for use in thesaurus'
- 'beanshell: interactive java -- good for prototyping/macros'
- 'libwpg: library for importing and converting WordPerfect Graphics format'
- 'sane: for scanner access'
- 'unixodbc: adds ODBC database support'
- 'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
- 'libpaper: takes care of papersize'
- 'postgresql-libs: for postgresql-connector'
- 'mariadb-libs: for mysql-connector'
- 'coin-or-mp: required by the Calc solver'
- 'gtk3: for GTK3 integration'
- 'kio: for KF5 KDE desktop integration')
- backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf
- etc/profile.d/libreoffice-fresh.sh
- etc/profile.d/libreoffice-fresh.csh)
- provides=('libreoffice' 'libreoffice-en-US')
- conflicts=('libreoffice-still')
-
- mv fakeinstall/* "${pkgdir}"/
-
- # put configuration files into place
- install -dm755 "${pkgdir}"/etc/libreoffice
- install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
- "${pkgdir}"/etc/libreoffice/
- install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
- "${pkgdir}"/etc/libreoffice/
-
- # install dummy links to make them found by LibO
- cd "${pkgdir}"/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- # allow to preset desired VLC
- install -dm755 "${pkgdir}"/etc/profile.d
- install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/
-
- # make pyuno find its modules
- install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py \
- "${pkgdir}"/usr/lib/python3.10/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py \
- "${pkgdir}"/usr/lib/python3.10/site-packages/unohelper.py
-
- # add a symlink required for gnome-documents; FS#51887
- # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
- ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
- "${pkgdir}"/usr/lib/liblibreofficekitgtk.so
-
- # cleanup
- rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
-
- # add application descriptions
- install -dm755 "${pkgdir}"/usr/share/metainfo
- install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
- "${pkgdir}"/usr/share/metainfo
-
- # add kde filemanager templates; FS#61662 - file taken from Debian
- install -dm755 "${pkgdir}"/usr/share/templates/.source
- install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
- "${pkgdir}"/usr/share/templates/.source
-
- cat "${srcdir}"/soffice-template.desktop.in \
- | sed -e "s/@APP@/Writer/" \
- | sed -e "s/@EXT@/odt/" \
- | sed -e "s/@TYPE@/text/" \
- > "${pkgdir}"/usr/share/templates/soffice.odt.desktop
- cat "${srcdir}"/soffice-template.desktop.in \
- | sed -e "s/@APP@/Calc/" \
- | sed -e "s/@EXT@/ods/" \
- | sed -e "s/@TYPE@/spreadsheet/" \
- > "${pkgdir}"/usr/share/templates/soffice.ods.desktop
- cat "${srcdir}"/soffice-template.desktop.in \
- | sed -e "s/@APP@/Impress/" \
- | sed -e "s/@EXT@/odp/" \
- | sed -e "s/@TYPE@/presentation/" \
- > "${pkgdir}"/usr/share/templates/soffice.odp.desktop
- cat "${srcdir}"/soffice-template.desktop.in \
- | sed -e "s/@APP@/Draw/" \
- | sed -e "s/@EXT@/odg/" \
- | sed -e "s/@TYPE@/drawing/" \
- > "${pkgdir}"/usr/share/templates/soffice.odg.desktop
-
- # make all i18n lang packages with help section ('1') available to
- # fix "F1" not opening translated offline help opening in browser
- # see also /usr/lib/libreoffice/help/en-US/langnames.js
- echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
- 'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
- 'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
- 'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
- 'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
- 'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
- > "${pkgdir}"/usr/lib/libreoffice/help/languages.js
-}
Copied: libreoffice-fresh/repos/extra-x86_64/PKGBUILD (from rev 438260, libreoffice-fresh/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,405 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+
+# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys. Feel free to contact foutrelis at archlinux.org for
+# more information.
+_google_default_client_id=413772536636.apps.googleusercontent.com
+_google_default_client_secret=0ZChLK6AxeA3Isu96MkwqDR4
+
+pkgbase=libreoffice-fresh
+pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
+_LOver=7.3.0.3
+pkgver=7.3.0
+pkgrel=6
+arch=('x86_64')
+license=('LGPL3')
+url="https://www.libreoffice.org/"
+makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
+ 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib'
+ 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
+ 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+ 'libmspub' 'harfbuzz-icu' 'nss' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'gst-plugins-base-libs'
+ 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'ant'
+ 'gperf' 'gtk3' 'qt5-base' 'plasma-framework' 'cppunit' 'beanshell' 'clucene'
+ 'junit' 'libmythes' 'libwpg' 'java-environment=11' 'postgresql-libs' 'mariadb-libs' 'libgl'
+ 'bluez-libs' 'gdb' 'doxygen' 'libatomic_ops' 'mdds'
+ 'apr' 'serf' 'ttf-liberation' 'ttf-dejavu' 'ttf-carlito' 'libxinerama' 'libpagemaker' 'glm'
+ 'libabw' 'libmwaw' 'libe-book' 'coin-or-mp' 'liblangtag' 'liborcus'
+# 'libexttextcat' 'libcmis' 'gobject-introspection' # 'libfbclient'
+ 'libexttextcat' 'gobject-introspection' # 'libfbclient'
+ 'libtommath' 'libzmf' 'gpgme' 'xmlsec' 'rxvt-unicode'
+ 'libepubgen' 'libfreehand' 'libqxp' 'libstaroffice' 'boost' 'libnumbertext'
+ 'libcuckoo' 'abseil-cpp' 'zxing-cpp' 'clang'
+ 'libffi' 'box2d' 'git'
+)
+options=('!lto') # using --enable-lto (for parallel link-time optimization)
+_mirror="https://download.documentfoundation.org/libreoffice/src/${pkgver}"
+#_mirror="https://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="https://dev-www.libreoffice.org/src"
+_additional_source_url2="https://dev-www.libreoffice.org/extern"
+source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
+ ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip # keep old bundled version, new system version ftbs
+ ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ ${_additional_source_url}/language-subtag-registry-2021-03-05.tar.bz2
+ ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${_additional_source_url}/pdfium-4699.tar.bz2
+ ${_additional_source_url}/dtoa-20180411.tgz
+ ${_additional_source_url}/lxml-4.1.1.tgz
+ ${_additional_source_url}/Firebird-3.0.7.33374-0.tar.bz2
+ ${_additional_source_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
+ ${_additional_source_url}/libcmis-0.5.2.tar.xz
+ ${_additional_source_url2}/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
+ ${_additional_source_url2}/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
+ ${_additional_source_url2}/f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
+ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ make-pyuno-work-with-system-wide-module-install.diff
+ 0001_drop_the_SolarMutex_before_QApplication.patch
+ 0002_update_kf5_include_lib_check.patch
+ 0003_tdf147611_fix_indices.patch
+ soffice-template.desktop.in
+ libreoffice-fresh.sh libreoffice-fresh.csh)
+noextract=(35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ language-subtag-registry-2021-03-05.tar.bz2
+ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ pdfium-4699.tar.bz2
+ dtoa-20180411.tgz
+ lxml-4.1.1.tgz
+ Firebird-3.0.7.33374-0.tar.bz2
+ #zxing-cpp-1.1.1.tar.gz
+ skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz
+ libcmis-0.5.2.tar.xz
+ 8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar # for test suite
+ odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar # for test suite
+ f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140-opens___.ttf
+ 185d60944ea767075d27247c3162b3bc-unowinreg.dll
+)
+validpgpkeys=('C2839ECAD9408FBE9531C3E9F434A1EFAFEEAEA3') # LibreOffice Build Team (CODE SIGNING KEY) <build at documentfoundation.org>
+sha256sums=('98d369c9541f0c3286345b93f448f2ceb2e344865ee01bdd58f3bb27f08f3f25'
+ 'SKIP'
+ '53b091291b1a857e98db9332386322ffa1410932b53215fa8eecb7acd96d931b'
+ 'SKIP'
+ '43e9d768af1a74242455741670a70bd9f3a1e01ec4599caddb16e0825614e7fe'
+ 'SKIP'
+ '64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1'
+ '1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753'
+ '75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870'
+ '983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776'
+ 'ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a'
+ 'd30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370'
+ '1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133'
+ '233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd'
+ 'ee80fe0a3b20ef5c5babc494cd655d1b1a0bdec710acb04524789df500c563bf'
+ '0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4'
+ '940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e'
+ 'acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76'
+ '97e859e8467eca9d2441cd23079b61c2c3863b5687620f18cc31a9f966740177'
+ 'd7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2'
+ 'f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770'
+ '984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504'
+ 'f543e6e2d7275557a839a164941c0a86e5f2c3f2a0042bfc434c88c6dde9e140'
+ 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6'
+ 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563'
+ '81a8551aaea0ab1750d36fb8bfbd04340a43eaab349a43c1384d21ef6504ab47'
+ '1cc5aeac9b8e91786701727d97b58039afc3db3dbc7977a3651d3263240798b3'
+ 'a825f71f71658d18a31f2331351e9310d8996501cab79f411a0c7b9c1b53c70c'
+ 'd0be8099cbee3c9dfda694a828149b881c345b204ab68826f317580aafb50879'
+ 'cd1b25ff390e436c6bffa65c6e12382236e3ccbf8d3aae51b1b59bcaed79fd8a'
+ 'de20f36d45f0fecc2d94176dd3ec7226ab07fa8ffb9b0bc73c200349a9273de1')
+
+prepare() {
+
+ cd libreoffice-$_LOver
+
+ # move external sources into place
+ mkdir "${srcdir}"/ext_sources && pushd "${srcdir}"/ext_sources
+ for source in "${noextract[@]}"; do
+ ln -s "${srcdir}"/$source .
+ done
+ popd
+
+ # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+ # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ rm "${srcdir}"/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ cp -f "${srcdir}"/185d60944ea767075d27247c3162b3bc-unowinreg.dll "${srcdir}"/ext_sources
+
+ # fix not upstreamable pyuno paths - FS#54250
+ patch -Np1 -i "${srcdir}"/make-pyuno-work-with-system-wide-module-install.diff
+
+ # fix crash on start - FS#73471
+ patch -Np1 -i "${srcdir}"/0001_drop_the_SolarMutex_before_QApplication.patch
+
+ # fix kf5 chances
+ # https://cgit.freedesktop.org/libreoffice/core/commit/?id=5fd5e42bf28a7910321c6b6d76257e7386839fbc
+ patch -Np1 -i "${srcdir}"/0002_update_kf5_include_lib_check.patch
+
+ # https://bugs.archlinux.org/task/73987
+ # https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-7-3&id=e85d2140ae5e9a611754c29aa4e5cdb6ad7fcab0
+ patch -Np1 -i "${srcdir}"/0003_tdf147611_fix_indices.patch
+
+ #use the CFLAGS but remove the LibO overridden ones
+ for i in $CFLAGS; do
+ case "$i" in
+ -O?|-pipe|-Wall|-g|-fexceptions) continue;;
+ esac
+ ARCH_FLAGS="$ARCH_FLAGS $i"
+ done
+}
+
+build() {
+ cd libreoffice-$_LOver
+
+ # strip -s from Makeflags in case you use it to shorten build logs
+ _MAKEFLAGS=${MAKEFLAGS/-s/}
+
+ # http://site.icu-project.org/download/61#TOC-Migration-Issues
+ CPPFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
+
+ ./autogen.sh --with-extra-buildid="${pkgver}-${pkgrel}" \
+ --with-vendor="Arch Linux" \
+ --enable-split-app-modules \
+ --with-parallelism=${_MAKEFLAGS/-j/} \
+ --with-external-tar="${srcdir}/ext_sources" \
+ --disable-fetch-external \
+ --enable-release-build \
+ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib --mandir=/usr/share/man \
+ --with-lang="" \
+ --with-help=html \
+ --disable-avahi \
+ --enable-dbus \
+ --enable-evolution2\
+ --enable-gio\
+ --enable-gtk3-kde5 \
+ --enable-kf5 \
+ --enable-qt5 \
+ --enable-gtk3 \
+ --enable-introspection \
+ --enable-lto \
+ --enable-openssl \
+ --enable-odk\
+ --enable-python=system \
+ --enable-scripting-beanshell \
+ --enable-scripting-javascript \
+ --disable-dconf \
+ --disable-report-builder \
+ --enable-ext-wiki-publisher \
+ --enable-ext-nlpsolver \
+ --without-fonts\
+ --with-system-apr \
+ --with-system-libcdr \
+ --with-system-mdds\
+ --without-myspell-dicts \
+ --with-system-libvisio \
+ --without-system-libcmis \
+ --with-system-libmspub \
+ --with-system-libexttextcat \
+ --with-system-orcus \
+ --with-system-liblangtag \
+ --with-system-libodfgen \
+ --with-system-libmwaw \
+ --with-system-libetonyek \
+ --with-system-libfreehand \
+ --without-system-firebird \
+ --with-system-zxing \
+ --with-system-libtommath \
+ --with-system-libatomic-ops \
+ --with-system-libebook \
+ --with-system-libabw \
+ --with-system-coinmp \
+ --with-system-dicts \
+ --with-external-dict-dir=/usr/share/hunspell \
+ --with-external-hyph-dir=/usr/share/hyphen \
+ --with-external-thes-dir=/usr/share/mythes \
+ --with-system-beanshell \
+ --with-system-cppunit\
+ --with-system-graphite\
+ --with-system-glm \
+ --with-system-libnumbertext \
+ --with-system-libwpg \
+ --with-system-libwps \
+ --with-system-redland\
+ --with-system-libzmf \
+ --with-system-gpgmepp \
+ --with-system-libstaroffice \
+ --with-system-cuckoo \
+ --with-system-serf \
+ --with-jdk-home="/usr/lib/jvm/default" \
+ --with-ant-home="/usr/share/ant"\
+ --with-system-boost\
+ --with-system-icu \
+ --with-system-cairo \
+ --with-system-libs \
+ --with-system-mythes \
+ --with-system-headers \
+ --without-system-hsqldb \
+ --with-system-clucene \
+ --with-gdrive-client-id=${_google_default_client_id} \
+ --with-gdrive-client-secret=${_google_default_client_secret} \
+ --disable-dependency-tracking
+
+ touch src.downloaded
+ make build-nocheck
+
+ mkdir "${srcdir}"/fakeinstall
+ make DESTDIR="${srcdir}"/fakeinstall distro-pack-install
+}
+
+#check() {
+# cd "${srcdir}"/build
+# make check
+#}
+
+package_libreoffice-fresh-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice Fresh"
+ depends=('libreoffice-fresh' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ provides=('libreoffice-sdk')
+ conflicts=('libreoffice-still-sdk')
+
+ for dir in $(grep -h ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+ install -dm755 "${pkgdir}"/${dir/\%dir/}
+ done
+
+ for file in $(grep -h -v ^%dir libreoffice-$_LOver/file-lists/sdk{,_doc}_list.txt); do
+ dirname=$(dirname $file)
+ [[ -d "${pkgdir}"/$dirname ]] || install -dm755 "${pkgdir}"/$dirname
+ mv "${srcdir}"/fakeinstall/${file} "${pkgdir}"/$file
+ done
+
+ # fix environment path to keep compatibility with other java-environments
+ sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" \
+ "${pkgdir}"/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+
+ # fix permissions
+ find "${pkgdir}"/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} +
+
+ # add LibreOfficeKit headers; FS#48066
+ install -dm755 "${pkgdir}"/usr/include/LibreOfficeKit
+ install -v -m644 "${srcdir}"/libreoffice-$_LOver/include/LibreOfficeKit/* "${pkgdir}"/usr/include/LibreOfficeKit
+}
+
+package_libreoffice-fresh() {
+ pkgdesc="LibreOffice branch which contains new features and program enhancements"
+ depends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.7' 'libwpd>=0.9.2' 'libwps'
+ 'neon>=0.28.6' 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl'
+ 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'graphite' 'icu'
+ 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen' 'libcdr'
+ 'libmspub' 'harfbuzz-icu' 'nss' 'clucene' 'hicolor-icon-theme'
+ 'desktop-file-utils' 'shared-mime-info' 'libpagemaker'
+ 'libxinerama' 'libabw' 'libmwaw' 'libe-book' 'libcups'
+ #'liblangtag' 'libexttextcat' 'libcmis' 'liborcus' # 'libfbclient'
+ 'liblangtag' 'libexttextcat' 'liborcus' # 'libfbclient'
+ 'libtommath' 'libzmf' 'libatomic_ops' 'xmlsec' 'gpgme' 'libnumbertext'
+ 'libfreehand' 'libstaroffice' 'libepubgen' 'libqxp' 'libepoxy' 'box2d'
+ 'zxing-cpp'
+ 'xdg-utils')
+ optdepends=('java-runtime: adds java support'
+ 'java-environment: required by extension-wiki-publisher and extension-nlpsolver'
+ 'pstoedit: translates PostScript and PDF graphics into other vector formats'
+ 'libmythes: for use in thesaurus'
+ 'beanshell: interactive java -- good for prototyping/macros'
+ 'libwpg: library for importing and converting WordPerfect Graphics format'
+ 'sane: for scanner access'
+ 'unixodbc: adds ODBC database support'
+ 'gst-plugins-base-libs: for multimedia content, e.g. in Impress'
+ 'libpaper: takes care of papersize'
+ 'postgresql-libs: for postgresql-connector'
+ 'mariadb-libs: for mysql-connector'
+ 'coin-or-mp: required by the Calc solver'
+ 'gtk3: for GTK3 integration'
+ 'kio: for KF5 KDE desktop integration')
+ backup=(etc/libreoffice/sofficerc
+ etc/libreoffice/bootstraprc
+ etc/libreoffice/psprint.conf
+ etc/profile.d/libreoffice-fresh.sh
+ etc/profile.d/libreoffice-fresh.csh)
+ provides=('libreoffice' 'libreoffice-en-US')
+ conflicts=('libreoffice-still')
+
+ mv fakeinstall/* "${pkgdir}"/
+
+ # put configuration files into place
+ install -dm755 "${pkgdir}"/etc/libreoffice
+ install -m644 "${pkgdir}"/usr/lib/libreoffice/program/{bootstraprc,sofficerc} \
+ "${pkgdir}"/etc/libreoffice/
+ install -m644 "${pkgdir}"/usr/lib/libreoffice/share/psprint/psprint.conf \
+ "${pkgdir}"/etc/libreoffice/
+
+ # install dummy links to make them found by LibO
+ cd "${pkgdir}"/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd "${pkgdir}"/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+
+ # allow to preset desired VLC
+ install -dm755 "${pkgdir}"/etc/profile.d
+ install -m644 "${srcdir}"/libreoffice-fresh.{sh,csh} "${pkgdir}"/etc/profile.d/
+
+ # make pyuno find its modules
+ install -dm755 "${pkgdir}"/usr/lib/python3.10/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py \
+ "${pkgdir}"/usr/lib/python3.10/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py \
+ "${pkgdir}"/usr/lib/python3.10/site-packages/unohelper.py
+
+ # add a symlink required for gnome-documents; FS#51887
+ # https://lists.freedesktop.org/archives/libreoffice/2016-March/073787.html
+ ln -svf /usr/lib/libreoffice/program/liblibreofficekitgtk.so \
+ "${pkgdir}"/usr/lib/liblibreofficekitgtk.so
+
+ # cleanup
+ rm -rf "${pkgdir}"/usr/share/libreoffice/sdk
+
+ # add application descriptions
+ install -dm755 "${pkgdir}"/usr/share/metainfo
+ install -v -m644 "${srcdir}"/libreoffice-$_LOver/sysui/desktop/appstream-appdata/*.xml \
+ "${pkgdir}"/usr/share/metainfo
+
+ # add kde filemanager templates; FS#61662 - file taken from Debian
+ install -dm755 "${pkgdir}"/usr/share/templates/.source
+ install -v -m644 "${srcdir}"/libreoffice-$_LOver/extras/source/shellnew/soffice.* \
+ "${pkgdir}"/usr/share/templates/.source
+
+ cat "${srcdir}"/soffice-template.desktop.in \
+ | sed -e "s/@APP@/Writer/" \
+ | sed -e "s/@EXT@/odt/" \
+ | sed -e "s/@TYPE@/text/" \
+ > "${pkgdir}"/usr/share/templates/soffice.odt.desktop
+ cat "${srcdir}"/soffice-template.desktop.in \
+ | sed -e "s/@APP@/Calc/" \
+ | sed -e "s/@EXT@/ods/" \
+ | sed -e "s/@TYPE@/spreadsheet/" \
+ > "${pkgdir}"/usr/share/templates/soffice.ods.desktop
+ cat "${srcdir}"/soffice-template.desktop.in \
+ | sed -e "s/@APP@/Impress/" \
+ | sed -e "s/@EXT@/odp/" \
+ | sed -e "s/@TYPE@/presentation/" \
+ > "${pkgdir}"/usr/share/templates/soffice.odp.desktop
+ cat "${srcdir}"/soffice-template.desktop.in \
+ | sed -e "s/@APP@/Draw/" \
+ | sed -e "s/@EXT@/odg/" \
+ | sed -e "s/@TYPE@/drawing/" \
+ > "${pkgdir}"/usr/share/templates/soffice.odg.desktop
+
+ # make all i18n lang packages with help section ('1') available to
+ # fix "F1" not opening translated offline help opening in browser
+ # see also /usr/lib/libreoffice/help/en-US/langnames.js
+ echo "var languagesSet = new Set(['en-US','am','ar','ast','bg','bn',\
+ 'bn-IN','bo','bs','ca','ca-valencia','cs','da','de','dz','el',\
+ 'en-GB','en-ZA','eo','es','et','eu','fi','fr','gl','gu','he',\
+ 'hi','hr','hu','id','is','it','ja','ka','km','ko','lo','lt','lv',\
+ 'mk','nb','ne','nl','nn','om','pl','pt','pt-BR','ro','ru','si',\
+ 'sid','sk','sl','sq','sv','ta','tg','tr','ug','uk','vi','zh-CN','zh-TW'])" \
+ > "${pkgdir}"/usr/lib/libreoffice/help/languages.js
+}
Deleted: libreoffice-fresh.csh
===================================================================
--- libreoffice-fresh.csh 2022-03-01 11:08:05 UTC (rev 438260)
+++ libreoffice-fresh.csh 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,7 +0,0 @@
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN gtk3_kde5
-#setenv SAL_USE_VCLPLUGIN kf5
-#setenv SAL_USE_VCLPLUGIN qt5
-#setenv SAL_USE_VCLPLUGIN gtk3
Copied: libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.csh (from rev 438260, libreoffice-fresh/trunk/libreoffice-fresh.csh)
===================================================================
--- libreoffice-fresh.csh (rev 0)
+++ libreoffice-fresh.csh 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,7 @@
+# to force a certain look'n feel
+
+#setenv SAL_USE_VCLPLUGIN gen
+#setenv SAL_USE_VCLPLUGIN gtk3_kde5
+#setenv SAL_USE_VCLPLUGIN kf5
+#setenv SAL_USE_VCLPLUGIN qt5
+#setenv SAL_USE_VCLPLUGIN gtk3
Deleted: libreoffice-fresh.sh
===================================================================
--- libreoffice-fresh.sh 2022-03-01 11:08:05 UTC (rev 438260)
+++ libreoffice-fresh.sh 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,7 +0,0 @@
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=gtk3_kde5
-#export SAL_USE_VCLPLUGIN=kf5
-#export SAL_USE_VCLPLUGIN=qt5
-#export SAL_USE_VCLPLUGIN=gtk3
Copied: libreoffice-fresh/repos/extra-x86_64/libreoffice-fresh.sh (from rev 438260, libreoffice-fresh/trunk/libreoffice-fresh.sh)
===================================================================
--- libreoffice-fresh.sh (rev 0)
+++ libreoffice-fresh.sh 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,7 @@
+# to force a certain look'n feel
+
+#export SAL_USE_VCLPLUGIN=gen
+#export SAL_USE_VCLPLUGIN=gtk3_kde5
+#export SAL_USE_VCLPLUGIN=kf5
+#export SAL_USE_VCLPLUGIN=qt5
+#export SAL_USE_VCLPLUGIN=gtk3
Deleted: make-pyuno-work-with-system-wide-module-install.diff
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff 2022-03-01 11:08:05 UTC (rev 438260)
+++ make-pyuno-work-with-system-wide-module-install.diff 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,18 +0,0 @@
---- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200
-+++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200
-@@ -16,8 +16,14 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
--import pyuno
-+
-+# Special modification to make uno load on Arch
-+import os
- import sys
-+sys.path.append("/usr/lib/libreoffice/program/")
-+os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
-+
-+import pyuno
- import traceback
- import warnings
-
Copied: libreoffice-fresh/repos/extra-x86_64/make-pyuno-work-with-system-wide-module-install.diff (from rev 438260, libreoffice-fresh/trunk/make-pyuno-work-with-system-wide-module-install.diff)
===================================================================
--- make-pyuno-work-with-system-wide-module-install.diff (rev 0)
+++ make-pyuno-work-with-system-wide-module-install.diff 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,18 @@
+--- a/pyuno/source/module/uno.py 2017-05-03 18:46:29.000000000 +0200
++++ b/pyuno/source/module/uno.py.new 2017-06-06 17:11:27.585959637 +0200
+@@ -16,8 +16,14 @@
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+-import pyuno
++
++# Special modification to make uno load on Arch
++import os
+ import sys
++sys.path.append("/usr/lib/libreoffice/program/")
++os.putenv("URE_BOOTSTRAP", "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc")
++
++import pyuno
+ import traceback
+ import warnings
+
Deleted: soffice-template.desktop.in
===================================================================
--- soffice-template.desktop.in 2022-03-01 11:08:05 UTC (rev 438260)
+++ soffice-template.desktop.in 2022-03-01 11:08:26 UTC (rev 438261)
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=LibreOffice @APP@ ...
-Comment=Enter LibreOffice @APP@ filename:
-Comment[de]=Name der LibreOffice @APP at -Datei eingeben:
-Type=Link
-URL=.source/soffice. at EXT@
-Icon=libreoffice-oasis- at TYPE@
Copied: libreoffice-fresh/repos/extra-x86_64/soffice-template.desktop.in (from rev 438260, libreoffice-fresh/trunk/soffice-template.desktop.in)
===================================================================
--- soffice-template.desktop.in (rev 0)
+++ soffice-template.desktop.in 2022-03-01 11:08:26 UTC (rev 438261)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=LibreOffice @APP@ ...
+Comment=Enter LibreOffice @APP@ filename:
+Comment[de]=Name der LibreOffice @APP at -Datei eingeben:
+Type=Link
+URL=.source/soffice. at EXT@
+Icon=libreoffice-oasis- at TYPE@
More information about the arch-commits
mailing list