diff --git a/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch b/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch index 9a44c1e..b6c3e17 100644 --- a/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch +++ b/0001-Force-icons-in-menus-in-GTK-3-VCLs.patch @@ -1,23 +1,7 @@ -From a1c8189f02ee694f049b2e04b9baffab3fafea22 Mon Sep 17 00:00:00 2001 -From: Mikhail Novosyolov -Date: Sun, 5 Apr 2020 20:53:46 +0300 -Subject: [PATCH] Force icons in menus in GTK+3 VCLs - -By default both IsSystemIconsInMenus and ShowIconsInMenues are true, -but IsSystemIconsInMenus being true forces taking GTK 3 default to not show icons. - -I beleive that icons help people to use menus. -Also, we are migrating users from libreoffice-kde4 to libreoffice-gtk3-kde5, -kde4 did show icons, so we would better keep them on. ---- - officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs -index 130726976..4b8c9055d 100644 ---- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -2909,7 +2909,7 @@ +diff -urN libreoffice-6.4.4.2/officecfg/registry/schema/org/openoffice/Office/Common.xcs libreoffice-6.4.4.2-patched/officecfg/registry/schema/org/openoffice/Office/Common.xcs +--- libreoffice-6.4.4.2/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/officecfg/registry/schema/org/openoffice/Office/Common.xcs 2020-06-03 11:29:32.879527737 +0300 +@@ -2875,7 +2875,7 @@ Indicates whether icons in the office menus should shown/hidden by following the System theme. @@ -26,6 +10,3 @@ index 130726976..4b8c9055d 100644 --- -2.20.1 - diff --git a/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch b/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch deleted file mode 100644 index 2f9bd7a..0000000 --- a/6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Sat, 22 Feb 2020 17:29:15 +0100 -Subject: [PATCH] Adapt o3tl::span to removal of std::span::cbegin et al - - "span::cbegin/cend methods produce -different results than std::[ranges::]cbegin/cend", as implemented now in - "libstdc++: Remove std::span::cbegin -and std::span::cend (LWG 3320)". - -Turns out we only used the removed member functions in o3tl/qa/test-span.cxx. - -Change-Id: I6c73797594b4e0e753a88840033d54961e271df5 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89261 -Tested-by: Jenkins -Reviewed-by: Stephan Bergmann ---- - include/o3tl/span.hxx | 7 ------- - o3tl/qa/test-span.cxx | 6 ------ - 2 files changed, 13 deletions(-) - ---- libreoffice-6.3.5.2/include/o3tl/span.hxx.orig 2020-04-04 16:27:13.798399505 +0300 -+++ libreoffice-6.3.5.2/include/o3tl/span.hxx 2020-04-04 16:28:05.080888607 +0300 -@@ -60,18 +60,11 @@ - constexpr iterator begin() const noexcept { return data_; } - constexpr iterator end() const noexcept { return begin() + size(); } - -- constexpr const_iterator cbegin() const noexcept { return begin(); } -- constexpr const_iterator cend() const noexcept { return end(); } -- - reverse_iterator rbegin() const noexcept - { return reverse_iterator(end()); } - reverse_iterator rend() const noexcept - { return reverse_iterator(begin()); } - -- constexpr const_reverse_iterator crbegin() const noexcept -- { return rbegin(); } -- constexpr const_reverse_iterator crend() const noexcept { return rend(); } -- - constexpr index_type size() const noexcept { return size_; } - - constexpr reference operator [](index_type pos) const { ---- libreoffice-6.3.5.2/o3tl/qa/test-span.cxx.orig 2020-04-04 16:27:13.802399388 +0300 -+++ libreoffice-6.3.5.2/o3tl/qa/test-span.cxx 2020-04-04 16:30:35.256474807 +0300 -@@ -33,15 +33,9 @@ - CPPUNIT_ASSERT_EQUAL(1, *v.begin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span::difference_type(3), v.end() - v.begin()); -- CPPUNIT_ASSERT_EQUAL(1, *v.cbegin()); -- CPPUNIT_ASSERT_EQUAL( -- o3tl::span::difference_type(3), v.cend() - v.cbegin()); - CPPUNIT_ASSERT_EQUAL(3, *v.rbegin()); - CPPUNIT_ASSERT_EQUAL( - o3tl::span::difference_type(3), v.rend() - v.rbegin()); -- CPPUNIT_ASSERT_EQUAL(3, *v.crbegin()); -- CPPUNIT_ASSERT_EQUAL( -- o3tl::span::difference_type(3), v.crend() - v.crbegin()); - CPPUNIT_ASSERT_EQUAL(o3tl::span::index_type(3), v.size()); - CPPUNIT_ASSERT(!v.empty()); - CPPUNIT_ASSERT_EQUAL(2, v[1]); diff --git a/gtk3_kde5-priority.patch b/gtk3_kde5-priority.patch index 7a9a1bc..be5b33b 100644 --- a/gtk3_kde5-priority.patch +++ b/gtk3_kde5-priority.patch @@ -1,11 +1,12 @@ ---- libreoffice-6.3.5.2/vcl/source/app/salplug.cxx.orig2 2020-04-04 20:44:52.950045617 +0300 -+++ libreoffice-6.3.5.2/vcl/source/app/salplug.cxx 2020-04-04 20:44:55.713958634 +0300 -@@ -151,12 +151,15 @@ +diff -urN libreoffice-6.4.4.2/vcl/source/app/salplug.cxx libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx +--- libreoffice-6.4.4.2/vcl/source/app/salplug.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx 2020-06-03 11:24:42.069512831 +0300 +@@ -149,12 +149,15 @@ { static const char* const pKDEFallbackList[] = { --#if ENABLE_KDE5 -- "kde5", +-#if ENABLE_KF5 +- "kf5", -#endif #if ENABLE_GTK3_KDE5 +// prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering; @@ -13,9 +14,9 @@ +// and other people wrote about problems in it //mikhailnov "gtk3_kde5", #endif -+#if ENABLE_KDE5 -+ "kde5", ++#if ENABLE_KF5 ++ "kf5", +#endif - "gtk3", "gtk", "gen", nullptr + "gtk3", "gen", nullptr }; diff --git a/libreoffice-6.3.5.2-kde4-detection.patch b/libreoffice-6.4.4.2-kde4-detection.patch similarity index 54% rename from libreoffice-6.3.5.2-kde4-detection.patch rename to libreoffice-6.4.4.2-kde4-detection.patch index 85da606..9aca9c0 100644 --- a/libreoffice-6.3.5.2-kde4-detection.patch +++ b/libreoffice-6.4.4.2-kde4-detection.patch @@ -1,66 +1,66 @@ -diff -urN libreoffice-6.3.5.2/vcl/inc/unx/desktops.hxx libreoffice-6.3.5.2-patched/vcl/inc/unx/desktops.hxx ---- libreoffice-6.3.5.2/vcl/inc/unx/desktops.hxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/inc/unx/desktops.hxx 2020-03-25 22:24:27.343432021 +1000 +diff -urN libreoffice-6.4.4.2/vcl/inc/unx/desktops.hxx libreoffice-6.4.4.2-patched/vcl/inc/unx/desktops.hxx +--- libreoffice-6.4.4.2/vcl/inc/unx/desktops.hxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/inc/unx/desktops.hxx 2020-06-03 15:34:37.770413281 +0300 @@ -31,6 +31,7 @@ DESKTOP_UNITY, DESKTOP_XFCE, DESKTOP_MATE, + DESKTOP_KDE4, - DESKTOP_KDE5, + DESKTOP_PLASMA5, DESKTOP_LXQT }; // keep in sync with desktop_strings[] in salplug.cxx -diff -urN libreoffice-6.3.5.2/vcl/source/app/IconThemeSelector.cxx libreoffice-6.3.5.2-patched/vcl/source/app/IconThemeSelector.cxx ---- libreoffice-6.3.5.2/vcl/source/app/IconThemeSelector.cxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/source/app/IconThemeSelector.cxx 2020-03-25 22:24:27.343432021 +1000 -@@ -56,7 +56,8 @@ - return OUString("colibre"); +diff -urN libreoffice-6.4.4.2/vcl/source/app/IconThemeSelector.cxx libreoffice-6.4.4.2-patched/vcl/source/app/IconThemeSelector.cxx +--- libreoffice-6.4.4.2/vcl/source/app/IconThemeSelector.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/source/app/IconThemeSelector.cxx 2020-06-03 15:36:36.153752538 +0300 +@@ -60,7 +60,8 @@ + return "colibre"; #else OUString r; -- if ( desktopEnvironment.equalsIgnoreAsciiCase("kde5") || +- if ( desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || + if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || -+ desktopEnvironment.equalsIgnoreAsciiCase("kde5") || ++ desktopEnvironment.equalsIgnoreAsciiCase("plasma5") || desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { r = "breeze"; } -diff -urN libreoffice-6.3.5.2/vcl/source/app/salplug.cxx libreoffice-6.3.5.2-patched/vcl/source/app/salplug.cxx ---- libreoffice-6.3.5.2/vcl/source/app/salplug.cxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/source/app/salplug.cxx 2020-03-25 22:41:24.079451287 +1000 +diff -urN libreoffice-6.4.4.2/vcl/source/app/salplug.cxx libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx +--- libreoffice-6.4.4.2/vcl/source/app/salplug.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/source/app/salplug.cxx 2020-06-03 15:34:37.783746616 +0300 @@ -95,6 +95,8 @@ * not access the 'gnome_accessibility_module_shutdown' anymore. * So make sure libgtk+ & co are still mapped into memory when * atk-bridge's atexit handler gets called. -+ * #i109007# KDE3 seems to have the same problem. -+ * And same applies for KDE4. ++ * * #i109007# KDE3 seems to have the same problem. ++ * * And same applies for KDE4. */ - if( rModuleBase == "gtk" || rModuleBase == "gtk3" || rModuleBase == "gtk3_kde5" || rModuleBase == "win" ) + if( aUsedModuleBase == "gtk3" || aUsedModuleBase == "gtk3_kde5" || aUsedModuleBase == "win" ) { -@@ -185,7 +187,8 @@ +@@ -185,7 +187,9 @@ desktop == DESKTOP_XFCE || desktop == DESKTOP_MATE ) pList = pStandardFallbackList; -- else if( desktop == DESKTOP_KDE5 || -+ else if( desktop == DESKTOP_KDE4 || -+ desktop == DESKTOP_KDE5 || - desktop == DESKTOP_LXQT ) +- else if (desktop == DESKTOP_PLASMA5 || desktop == DESKTOP_LXQT) ++ else if (desktop == DESKTOP_KDE4 || ++ desktop == DESKTOP_PLASMA5 || ++ desktop == DESKTOP_LXQT) pList = pKDEFallbackList; -@@ -318,7 +321,8 @@ + SalInstance* pInst = nullptr; +@@ -317,7 +321,7 @@ // Order to match desktops.hxx' DesktopType static const char * const desktop_strings[] = { "none", "unknown", "GNOME", "UNITY", -- "XFCE", "MATE", "KDE5", "LXQT" }; -+ "XFCE", "MATE", "KDE4", "KDE5", -+ "LXQT" }; +- "XFCE", "MATE", "PLASMA5", "LXQT" }; ++ "XFCE", "MATE", "KDE4", "PLASMA5", "LXQT" }; static OUString aDesktopEnvironment; if( aDesktopEnvironment.isEmpty()) { -diff -urN libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx libreoffice-6.3.5.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx ---- libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-03-25 22:28:24.099436507 +1000 -@@ -116,6 +116,80 @@ +diff -urN libreoffice-6.4.4.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx libreoffice-6.4.4.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx +--- libreoffice-6.4.4.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/unx/generic/desktopdetect/desktopdetector.cxx 2020-06-03 15:34:37.787079949 +0300 +@@ -110,6 +110,80 @@ + return ret; } - +static bool bWasXError = false; + +static bool WasXError() @@ -135,19 +135,19 @@ diff -urN libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx + return false; +} + - static bool is_kde5_desktop() + static bool is_plasma5_desktop() { - static const char * pFullVersion = getenv( "KDE_FULL_SESSION" ); -@@ -141,6 +215,8 @@ + static const char* pFullVersion = getenv("KDE_FULL_SESSION"); +@@ -130,6 +204,8 @@ + + if ( aOver.equalsIgnoreAsciiCase( "lxqt" ) ) return DESKTOP_LXQT; - if ( aOver.equalsIgnoreAsciiCase( "kde5" ) ) - return DESKTOP_KDE5; + if ( aOver.equalsIgnoreAsciiCase( "kde4" ) ) + return DESKTOP_KDE4; + if (aOver.equalsIgnoreAsciiCase("plasma5") || aOver.equalsIgnoreAsciiCase("plasma")) + return DESKTOP_PLASMA5; if ( aOver.equalsIgnoreAsciiCase( "gnome" ) ) - return DESKTOP_GNOME; - if ( aOver.equalsIgnoreAsciiCase( "gnome-wayland" ) ) -@@ -248,10 +324,16 @@ +@@ -238,10 +314,16 @@ return DESKTOP_NONE; DesktopType ret; @@ -168,36 +168,36 @@ diff -urN libreoffice-6.3.5.2/vcl/unx/generic/desktopdetect/desktopdetector.cxx XCloseDisplay( pDisplay ); -diff -urN libreoffice-6.3.5.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx libreoffice-6.3.5.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx ---- libreoffice-6.3.5.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-03-29 18:18:56.397261034 +1000 -@@ -248,7 +248,7 @@ +diff -urN libreoffice-6.4.4.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx libreoffice-6.4.4.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx +--- libreoffice-6.4.4.2/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/unx/gtk3_kde5/kde5_filepicker.cxx 2020-06-03 15:34:37.787079949 +0300 +@@ -245,7 +245,7 @@ // dialog there in order not to lose the custom controls and insert the custom // widget in the layout returned by QFileDialog::layout() // (which returns nullptr for native file dialogs) -- if (Application::GetDesktopEnvironment() == "KDE5") -+ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") +- if (Application::GetDesktopEnvironment() == "PLASMA5") ++ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4") { qApp->installEventFilter(this); } -diff -urN libreoffice-6.3.5.2/vcl/unx/kde5/KDE5SalInstance.cxx libreoffice-6.3.5.2-patched/vcl/unx/kde5/KDE5SalInstance.cxx ---- libreoffice-6.3.5.2/vcl/unx/kde5/KDE5SalInstance.cxx 2020-02-11 22:14:56.000000000 +1000 -+++ libreoffice-6.3.5.2-patched/vcl/unx/kde5/KDE5SalInstance.cxx 2020-03-29 18:16:44.371267490 +1000 +diff -urN libreoffice-6.4.4.2/vcl/unx/kf5/KF5SalInstance.cxx libreoffice-6.4.4.2-patched/vcl/unx/kf5/KF5SalInstance.cxx +--- libreoffice-6.4.4.2/vcl/unx/kf5/KF5SalInstance.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/vcl/unx/kf5/KF5SalInstance.cxx 2020-06-03 15:34:37.790413282 +0300 @@ -52,7 +52,7 @@ - bool KDE5SalInstance::hasNativeFileSelection() const + bool KF5SalInstance::hasNativeFileSelection() const { -- if (Application::GetDesktopEnvironment() == "KDE5") -+ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") +- if (Application::GetDesktopEnvironment() == "PLASMA5") ++ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4") return true; return Qt5Instance::hasNativeFileSelection(); } @@ -73,7 +73,7 @@ - // In order to insert custom controls, KDE5FilePicker currently relies on KFileWidget + // In order to insert custom controls, KF5FilePicker currently relies on KFileWidget // being used in the native file picker, which is only the case for KDE Plasma. // Therefore, return the plain qt5 one in order to not lose custom controls. -- if (Application::GetDesktopEnvironment() == "KDE5") -+ if (Application::GetDesktopEnvironment() == "KDE5" || Application::GetDesktopEnvironment() == "KDE4") - return new KDE5FilePicker(context, eMode); +- if (Application::GetDesktopEnvironment() == "PLASMA5") ++ if (Application::GetDesktopEnvironment() == "PLASMA5" || Application::GetDesktopEnvironment() == "KDE4") + return new KF5FilePicker(context, eMode); return Qt5Instance::createPicker(context, eMode); } diff --git a/libreoffice-6.4.4.2-qrcodegencpp.patch b/libreoffice-6.4.4.2-qrcodegencpp.patch new file mode 100644 index 0000000..cdc3c63 --- /dev/null +++ b/libreoffice-6.4.4.2-qrcodegencpp.patch @@ -0,0 +1,36 @@ +diff -urN libreoffice-6.4.4.2/configure libreoffice-6.4.4.2-patched/configure +--- libreoffice-6.4.4.2/configure 2020-05-13 14:54:07.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/configure 2020-06-03 10:31:23.389348663 +0300 +@@ -33808,7 +33808,7 @@ + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +- ac_fn_cxx_check_header_compile "$LINENO" "qrcodegen/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include ++ ac_fn_cxx_check_header_compile "$LINENO" "qrcodegencpp/QrCode.hpp" "ac_cv_header_qrcodegen_QrCode_hpp" "#include + " + if test "x$ac_cv_header_qrcodegen_QrCode_hpp" = xyes; then : + +diff -urN libreoffice-6.4.4.2/configure.ac libreoffice-6.4.4.2-patched/configure.ac +--- libreoffice-6.4.4.2/configure.ac 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/configure.ac 2020-06-03 10:31:54.056016909 +0300 +@@ -10066,7 +10066,7 @@ + AC_MSG_RESULT([external]) + SYSTEM_QRCODEGEN=TRUE + AC_LANG_PUSH([C++]) +- AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [], ++ AC_CHECK_HEADER(qrcodegencpp/QrCode.hpp, [], + [AC_MSG_ERROR(qrcodegen headers not found.)], [#include ]) + AC_CHECK_LIB([qrcodegencpp], [main], [:], + [ AC_MSG_ERROR(qrcodegen C++ library not found.) ], []) +diff -urN libreoffice-6.4.4.2/cui/source/dialogs/QrCodeGenDialog.cxx libreoffice-6.4.4.2-patched/cui/source/dialogs/QrCodeGenDialog.cxx +--- libreoffice-6.4.4.2/cui/source/dialogs/QrCodeGenDialog.cxx 2020-05-13 14:19:20.000000000 +0300 ++++ libreoffice-6.4.4.2-patched/cui/source/dialogs/QrCodeGenDialog.cxx 2020-06-03 10:35:25.766027804 +0300 +@@ -17,7 +17,7 @@ + #include + + #if defined(SYSTEM_QRCODEGEN) +-#include ++#include + #else + #include + #endif diff --git a/libreoffice.spec b/libreoffice.spec index 09f3f02..9d7145a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,8 +48,8 @@ Summary: Office suite Name: libreoffice Epoch: 1 -Version: 6.3.5 -Release: 9 +Version: 6.4.4 +Release: 1 License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic Group: Office Url: http://www.libreoffice.org @@ -66,27 +66,25 @@ Source10: Mandriva-Rosa_Icons.tar.bz2 %if %{javaless} Source20: http://archive.apache.org/dist/ant/binaries/apache-ant-%{antver}-bin.tar.bz2 %endif -Source33: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source33: %{srcurl}/62c0b97e94fe47d5e50ff605d2edf37a-hsqldb-2.3.3.zip +Source34: https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar Source35: %{devurl}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source36: %{devurl}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip Source37: %{devurl}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Source38: %{devurl}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Source39: %{srcurl}pdfium-3963.tar.bz2 + +# External Download Sources +Source40: http://hg.services.openoffice.org/binaries/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz # Extensions -Source49: %{srcurl}pdfium-3794.tar.bz2 +Source50: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt Source51: %{srcurl}b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 -Source54: %{oxyurl}b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -Source56: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt -Source60: %{oxyurl}af9314c5972d95a5d6da23ffad818f68-OOOP-gallery-pack-2.8.0.0.zip -Source61: %{oxyurl}1be202fbbbc13f10592a98f70a4a87fb-OOOP-templates-pack-2.9.0.0.zip -Source62: %{oxyurl}53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt -Source63: %{oxyurl}472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt -Source64: %{oxyurl}4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt -Source65: %{oxyurl}a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt -Source66: %{oxyurl}09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt -Source67: %{oxyurl}b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt -Source68: %{srcurl}4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 -Source69: %{srcurl}OpenCOLLADA-master-6509aa13af.tar.bz2 -Source70: %{srcurl}1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt +Source52: https://extensions.libreoffice.org/extensions/barcode/1.3.5.0/@@download/file/barcode_1.3.5.0.oxt +Source53: https://extensions.libreoffice.org/extensions/smart/0.94/@@download/file/smart_0.9.4_en_hu_corrected.oxt +Source54: %{srcurl}27211596cf0ad97cab7321239406fde0-gdocs_3.0.1_modified.oxt +#Source55: %{srcurl}b7cae45ad2c23551fd6ccb8ae2c1f59e-numbertext_0.9.5.oxt + Source71: %{srcurl}lxml-4.1.1.tgz Source72: %{devexurl}/884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc-opens___.ttf @@ -95,14 +93,11 @@ Source1000: libreoffice.rpmlintrc Patch0: libreoffice-5.4.0.1-disable-test-languagetag.patch Patch1: libreoffice-4.2.5-icu-49.patch -Patch2: libreoffice-6.3.5.2-kde4-detection.patch -# https://github.com/LibreOffice/core/commit/6fbfad6b -Patch3: 6fbfad6b00e8c35346ee59cd32a0d7ccc0d8c19c.patch -# For Clang <9, GCC <10, when building with libstdc++-gcc10 -Patch4: span-old-compilers.patch +Patch2: libreoffice-6.4.4.2-kde4-detection.patch # prefer gtk3_kde5 over kde5 because of maturity of gtk3 rendering Patch5: gtk3_kde5-priority.patch Patch6: 0001-Force-icons-in-menus-in-GTK-3-VCLs.patch +Patch7: libreoffice-6.4.4.2-qrcodegencpp.patch # ROSA vendor patch Patch100: libreoffice-4.1-vendor.patch @@ -278,6 +273,7 @@ BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5X11Extras) +BuildRequires: qr-code-generator-c++-devel %if !%{javaless} BuildRequires: ant BuildRequires: ant-apache-regexp @@ -884,7 +880,8 @@ for a in */*; do mv `pwd`/$a .; done %if %{javaless} tar -xjvf %{SOURCE20} %endif -%apply_patches + +%autopatch -p1 # to make the friggin cppunit tests work mkdir -p ~/tmp @@ -976,8 +973,8 @@ sed -i \ --with-external-thes-dir=%{_datadir}/dict/ooo \ --with-system-libs \ --with-system-ucpp \ + --with-system-qrcodegen=yes \ --enable-ext-ct2n \ - --enable-ext-numbertext \ --enable-ext-nlpsolver \ --enable-ext-languagetool \ --enable-ext-wiki-publisher \ @@ -1016,26 +1013,21 @@ ln -sf %{SOURCE3} external/tarballs/ cp %{SOURCE4} external/tarballs/ ln -sf %{SOURCE33} external/tarballs/ +ln -sf %{SOURCE34} external/tarballs/ ln -sf %{SOURCE35} external/tarballs/ ln -sf %{SOURCE36} external/tarballs/ ln -sf %{SOURCE37} external/tarballs/ +ln -sf %{SOURCE38} external/tarballs/ -cp %{SOURCE49} external/tarballs/ +cp %{SOURCE39} external/tarballs/ +cp %{SOURCE40} external/tarballs/ +ln -sf %{SOURCE50} external/tarballs/ ln -sf %{SOURCE51} external/tarballs/ +ln -sf %{SOURCE52} external/tarballs/ +ln -sf %{SOURCE53} external/tarballs/ ln -sf %{SOURCE54} external/tarballs/ -ln -sf %{SOURCE56} external/tarballs/ -ln -sf %{SOURCE60} external/tarballs/ -ln -sf %{SOURCE61} external/tarballs/ -ln -sf %{SOURCE62} external/tarballs/ -ln -sf %{SOURCE63} external/tarballs/ -ln -sf %{SOURCE64} external/tarballs/ -ln -sf %{SOURCE65} external/tarballs/ -ln -sf %{SOURCE66} external/tarballs/ -ln -sf %{SOURCE67} external/tarballs/ -ln -sf %{SOURCE68} external/tarballs/ -ln -sf %{SOURCE69} external/tarballs/ -ln -sf %{SOURCE70} external/tarballs/ +## ln -sf {SOURCE55} external/tarballs/ cp %{SOURCE71} external/tarballs/ cp %{SOURCE72} external/tarballs/