From 2b1e4f90df98423d292f52aa2bfa8eea877f02ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Tue, 30 Apr 2019 15:52:47 +0100 Subject: [PATCH] drop upstreamed patches --- ...grade-external-boost-to-Boost-1.69.0.patch | 74 ---------------- ...-combobox-in-format-cells-is-too-nar.patch | 85 ------------------- ...4-gpoll_wrapper-can-be-called-with-S.patch | 47 ---------- ...l-deref-of-pEntry-when-GetCurEntry-r.patch | 49 ----------- libreoffice.spec | 13 +-- 5 files changed, 4 insertions(+), 264 deletions(-) delete mode 100644 0001-Upgrade-external-boost-to-Boost-1.69.0.patch delete mode 100644 0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch delete mode 100644 0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch delete mode 100644 0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch diff --git a/0001-Upgrade-external-boost-to-Boost-1.69.0.patch b/0001-Upgrade-external-boost-to-Boost-1.69.0.patch deleted file mode 100644 index 8d89e48..0000000 --- a/0001-Upgrade-external-boost-to-Boost-1.69.0.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 23a8d5ffbbe58761b89f590f0735abccd69a3681 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Fri, 11 Jan 2019 17:40:17 +0100 -Subject: [PATCH] Upgrade external/boost to Boost 1.69.0 - - is a copy of -, -SHA256 hash as given at . - -* removed from external/boost/include/boost/ those files that are no longer - present in workdir/UnpackedTarball/boost/boost/ - -* the shrunk external/boost/rtti.patch.0 can probably be removed completely in a - follow-up commit - -* the patch to libs/filesystem/src/operations.cpp in - external/boost/boost-android-unified.patch.1 no longer applied, and appears to - be no longer necessary anyway (seeing a working build without it of - --with-distro=LibreOfficeAndroid and NDK r16b); but with the non-standard - Clang 5.0.300080 from NDK r16b, the build now caused failures like - -> workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:36:11: error: class template partial specialization contains a template parameter that cannot be deduced; this partial specialization will never be used [-Wunusable-partial-specialization] -> struct is_function : public true_type {}; -> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -> workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:35:38: note: non-deducible template parameter 'NE' -> template -> ^ -> workdir/UnpackedTarball/boost/boost/type_traits/detail/is_function_cxx_11.hpp:22:40: note: expanded from macro 'BOOST_TT_NOEXCEPT_PARAM' -> #define BOOST_TT_NOEXCEPT_PARAM , bool NE -> ^ - - showing that that version of Clang has the same problem handling noexcept(b) - as a deduced template parameter as MSVC has, as already supported by the code - -* new external/boost/sse.patch.0 needed on Windows x86 to silence errors like - -> C:\cygwin\home\tdf\lode\jenkins\workspace\gerrit_windows\workdir\UnpackedTarball\boost\boost/type_traits/detail/is_function_cxx_11.hpp(111): error C2215: '__vectorcall' cannot be used with '/arch:SSE' - - (); according to - : "_M_IX86_FP Defined as an integer literal value that indicates - the /arch compiler option that was set, or the default. This macro is always - defined when the compilation target is an x86 processor. Otherwise, undefined. - When defined, the value is: [...] 1 if the /arch:SSE compiler option was set." - and we specify /arch:SSE explicitly for Windows x86 since - 8bd6bf93b7711a7ac7c5cbd7c3bb980481570ebd "fdo#82430: configure: MSVC build: - avoid using SSE2 instructions" - -* boost::logic::tribool conversion operator to bool is explicit now - -Change-Id: Iea49560d734f545539f062dce46740fbf812dd84 -Reviewed-on: https://gerrit.libreoffice.org/66189 -Reviewed-by: Stephan Bergmann -Tested-by: Stephan Bergmann ---- - sfx2/source/appl/shutdownicon.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx -index a24e254c7948..65c73de125d9 100644 ---- a/sfx2/source/appl/shutdownicon.cxx -+++ b/sfx2/source/appl/shutdownicon.cxx -@@ -144,7 +144,7 @@ bool LoadModule() - #endif // ENABLE_QUICKSTART_APPLET - } - assert(!boost::logic::indeterminate(loaded)); -- return loaded; -+ return bool(loaded); - } - - } --- -2.20.1 - diff --git a/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch b/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch deleted file mode 100644 index 99bac2f..0000000 --- a/0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 115f3749a737de337f6b456dcc84b6e3a6fdfc0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 21 Feb 2019 15:57:22 +0000 -Subject: [PATCH] menu of currency combobox in format-cells is too narrow - -we want the combobox to be narrower than it wants to be. To make that happen -we have only the option of shrinking the cell renderer of the combobox area. -And that is also used by the menu. - -Setting a small value of e.g. 1 works to let the combobox not request more -width than that, and the combobox will correctly render within the wider size -it actually gets. But then the menu is a min width menu, which is undesirable, -we want the menu to be as wide as it can be. - -So calculate what part of the combobox belongs to the cell area and set -the widest cell area we can within the overall combobox width, resulting -in the widest menu we can get. - -Change-Id: Ie3e9960a320a70471ac21d2a88f32632cafa951f -Reviewed-on: https://gerrit.libreoffice.org/68168 -Tested-by: Jenkins -Reviewed-by: Miklos Vajna ---- - cui/source/tabpages/numfmt.cxx | 2 +- - vcl/unx/gtk3/gtk3gtkinst.cxx | 23 +++++++++++++++++------ - 2 files changed, 18 insertions(+), 7 deletions(-) - -diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx -index b6a4a8ba4d5c..d202232b951d 100644 ---- a/cui/source/tabpages/numfmt.cxx -+++ b/cui/source/tabpages/numfmt.cxx -@@ -234,7 +234,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(TabPageParent pParent, - auto nWidth = approximate_char_width() * 26; - m_xLbCategory->set_size_request(nWidth, m_xLbCategory->get_height_rows(7)); - m_xLbFormat->set_size_request(nWidth, m_xLbFormat->get_height_rows(5)); -- m_xLbCurrency->set_size_request(1, -1); // width of 1, so real width will be that of its LbFormat sibling -+ m_xLbCurrency->set_size_request(nWidth, -1); // width of 1, so real width will be that of its LbFormat sibling - - // Initially remove the "Automatically" entry. - m_xLbCurrency->set_active(-1); // First ensure that nothing is selected. -diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index a9fdfd3615eb..e81f451f7fa0 100644 ---- a/vcl/unx/gtk3/gtk3gtkinst.cxx -+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx -@@ -6978,20 +6978,31 @@ public: - // tweak the cell render to get a narrower size to stick - GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox)); - GtkCellRenderer* cell = static_cast(cells->data); -- GtkRequisition size; -- gtk_cell_renderer_get_preferred_size(cell, m_pWidget, &size, nullptr); -- if (nWidth < size.width) -+ -+ if (nWidth != -1) - { - // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let -- // the popup menu render them in full, in the interim ellipse both -+ // the popup menu render them in full, in the interim ellipse both of them - g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); -- gtk_cell_renderer_set_fixed_size(cell, nWidth, size.height); -+ -+ // to find out how much of the width of the combobox belongs to the cell, set -+ // the cell and widget to the min cell width and see what the difference is -+ int min; -+ gtk_cell_renderer_get_preferred_width(cell, m_pWidget, &min, nullptr); -+ gtk_cell_renderer_set_fixed_size(cell, min, -1); -+ gtk_widget_set_size_request(m_pWidget, min, -1); -+ int nNonCellWidth = get_preferred_size().Width() - min; -+ -+ // now set the cell to the max width which it can be within the -+ // requested widget width -+ gtk_cell_renderer_set_fixed_size(cell, nWidth - nNonCellWidth, -1); - } - else - { - g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_NONE, nullptr); -- gtk_cell_renderer_set_fixed_size(cell, -1, size.height); -+ gtk_cell_renderer_set_fixed_size(cell, -1, -1); - } -+ - g_list_free(cells); - - gtk_widget_set_size_request(m_pWidget, nWidth, nHeight); --- -2.21.0 - diff --git a/0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch b/0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch deleted file mode 100644 index 4065d5f..0000000 --- a/0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ad313992da1cf89f5825a4d1eb020392b5e32c6d Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann -Date: Tue, 19 Mar 2019 17:29:53 +0100 -Subject: [PATCH] rhbz#1687589: KDE4 gpoll_wrapper can be called with - SolarMutex unlocked - -...when called from MountOperation::Mount (ucb/source/ucp/gio/gio_content.cxx), -which itself contains a SolarMutexReleaser since -2eb36dc4b846ab5886ae71fd2978b56b2a2d1d08 "Hack to not leave SolarMutex released -after g_main_loop_run call". So calling SolarMutexReleaser ctor in -gpoll_wrapper will then cause comphelper::GenericSolarMutex::doRelease -(comphelper/source/misc/solarmutex.cxx) to call std::abort() because the -SolarMutex is not locked. - -Change-Id: If893b427e404cf3d9e48430f84cff7d32b61bf87 -Reviewed-on: https://gerrit.libreoffice.org/69436 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn ---- - vcl/unx/kde4/KDEXLib.cxx | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx -index 0852c543a6d7..22274690842b 100644 ---- a/vcl/unx/kde4/KDEXLib.cxx -+++ b/vcl/unx/kde4/KDEXLib.cxx -@@ -210,8 +210,15 @@ static GPollFunc old_gpoll = nullptr; - - static gint gpoll_wrapper( GPollFD* ufds, guint nfds, gint timeout ) - { -- SolarMutexReleaser aReleaser; -- return old_gpoll( ufds, nfds, timeout ); -+ if (GetSalData()->m_pInstance->GetYieldMutex()->IsCurrentThread()) -+ { -+ SolarMutexReleaser aReleaser; -+ return old_gpoll( ufds, nfds, timeout ); -+ } -+ else -+ { -+ return old_gpoll( ufds, nfds, timeout ); -+ } - } - #endif - --- -2.20.1 - diff --git a/0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch b/0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch deleted file mode 100644 index a700359..0000000 --- a/0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 49935e70b07d1e0ae6853ca1bd6d587dda562a71 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Wed, 20 Mar 2019 09:16:28 +0000 -Subject: [PATCH] rhbz#1690645 null deref of pEntry when GetCurEntry return - null - -in GetFocusRect at SvTreeList::GetDepth - -code in since.... - -commit 76c549eb01dcb7b5bf28a271ce00e386f3d388ba -Author: Steve Yin -Date: Fri Nov 29 13:03:27 2013 +0000 - - Integrate branch of IAccessible2 - -Change-Id: Ida6cb934c94037c861c7d5da005226f32599b5fc ---- - sw/source/uibase/utlui/content.cxx | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx -index 1bb69c686343..01021f7129e1 100644 ---- a/sw/source/uibase/utlui/content.cxx -+++ b/sw/source/uibase/utlui/content.cxx -@@ -2850,15 +2850,14 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) - //and realize multi-selection . - else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier()) - { -- - SvTreeListEntry* pEntry = GetCurEntry(); -- if( GetChildCount( pEntry ) == 0 ) -- m_bIsKeySpace = true; -- Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration -- m_aOldRectangle = GetFocusRect( pEntry,tempPoint.Y() ); -- - if(pEntry) - { -+ if( GetChildCount( pEntry ) == 0 ) -+ m_bIsKeySpace = true; -+ Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration -+ m_aOldRectangle = GetFocusRect(pEntry, tempPoint.Y()); -+ - if (State::HIDDEN != m_eState) - { - if (State::CONSTANT == m_eState) --- -2.20.1 - diff --git a/libreoffice.spec b/libreoffice.spec index 0cc9c23..161ba12 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -241,15 +241,10 @@ Requires: %{name}-emailmerge%{?_isa} = %{epoch}:%{version}-%{release} Patch0: 0001-don-t-suppress-crashes.patch # not upstreamed Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch -# not upstreamed -Patch2: 0001-Upgrade-external-boost-to-Boost-1.69.0.patch -Patch3: 0001-menu-of-currency-combobox-in-format-cells-is-too-nar.patch -Patch4: 0001-rhbz-1687589-KDE4-gpoll_wrapper-can-be-called-with-S.patch -Patch5: 0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch -Patch6: 0001-rhbz-1690732-basic-font-variation-support.patch -Patch7: 0001-rhbz-1699347-__glibcxx_requires_subscript-enabled-in.patch -Patch8: 0001-no-home-as-templates.patch -Patch9: 0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch +Patch2: 0001-rhbz-1690732-basic-font-variation-support.patch +Patch3: 0001-rhbz-1699347-__glibcxx_requires_subscript-enabled-in.patch +Patch4: 0001-no-home-as-templates.patch +Patch5: 0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch %if 0%{?rhel} # not upstreamed