From 595b496eb1927b42dee22d1a6a811a37fc68e767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 17 Nov 2022 09:27:19 +0000 Subject: [PATCH] Resolves: rhbz#2143431 fix autofilter missing search entry --- ...699-show-hide-the-overlay-along-with.patch | 48 +++++++++++++++++++ ...-rhbz-2136459-throw-a-volatile-at-it.patch | 26 ---------- libreoffice.spec | 8 ++-- 3 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 0001-Resolves-tdf-151699-show-hide-the-overlay-along-with.patch delete mode 100644 0001-rhbz-2136459-throw-a-volatile-at-it.patch diff --git a/0001-Resolves-tdf-151699-show-hide-the-overlay-along-with.patch b/0001-Resolves-tdf-151699-show-hide-the-overlay-along-with.patch new file mode 100644 index 0000000..2b38f5a --- /dev/null +++ b/0001-Resolves-tdf-151699-show-hide-the-overlay-along-with.patch @@ -0,0 +1,48 @@ +From 3f472b496be39a0fc1630cd31bfc5f1b9747127e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Sat, 22 Oct 2022 15:05:51 +0100 +Subject: [PATCH] =?UTF-8?q?Resolves:=20tdf#151699=C2=A0show/hide=20the=20o?= + =?UTF-8?q?verlay=20along=20with=20the=20edit?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +if its present + +Change-Id: I9f167117329b9fa33a79271c1f97fcb10ab9de32 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141590 +Tested-by: Jenkins +Reviewed-by: Michael Stahl +--- + vcl/unx/gtk3/gtkinst.cxx | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx +index cd9bb63ae4ce..886375486336 100644 +--- a/vcl/unx/gtk3/gtkinst.cxx ++++ b/vcl/unx/gtk3/gtkinst.cxx +@@ -13242,6 +13242,21 @@ public: + } + + #if !GTK_CHECK_VERSION(4, 0, 0) ++ ++ virtual void show() override ++ { ++ GtkInstanceEditable::show(); ++ if (m_pPlaceHolderReplacement) ++ gtk_widget_show(GTK_WIDGET(m_pPlaceHolderReplacement)); ++ } ++ ++ virtual void hide() override ++ { ++ if (m_pPlaceHolderReplacement) ++ gtk_widget_hide(GTK_WIDGET(m_pPlaceHolderReplacement)); ++ GtkInstanceEditable::hide(); ++ } ++ + virtual ~GtkInstanceEntry() override + { + if (m_nUpdatePlaceholderReplacementIdle) +-- +2.38.1 + diff --git a/0001-rhbz-2136459-throw-a-volatile-at-it.patch b/0001-rhbz-2136459-throw-a-volatile-at-it.patch deleted file mode 100644 index 40315c2..0000000 --- a/0001-rhbz-2136459-throw-a-volatile-at-it.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dc6b3068dad63792dcd223ac32651f70341b4006 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Thu, 20 Oct 2022 12:50:14 +0100 -Subject: [PATCH] rhbz#2136459 throw a volatile at it - -Change-Id: I4fd734e8169fdb6d4d4779c76c80b6303eea2412 ---- - bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx -index ed48be648bca..17a50e244370 100644 ---- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx -+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx -@@ -533,7 +533,7 @@ long privateSnippetExecutor(long r2, long r3, long r4, long r5, long r6, long fi - } - //deliberate fall through - case typelib_TypeClass_DOUBLE: -- __asm__ ( "ld 0,%0\n\t" -+ __asm__ volatile ( "ld 0,%0\n\t" - : : "m" (*((double*)nRegReturn)) ); - break; - } --- -2.37.3 - diff --git a/libreoffice.spec b/libreoffice.spec index 42572e5..2e71791 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -55,7 +55,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.3 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?libo_prerelease}%{?dist} # default new files are: MPLv2 # older files are typically: MPLv2 incorporating work under ASLv2 # nlpsolver is: LGPLv3 @@ -262,8 +262,7 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch -# rhbz#2136459 -Patch4: 0001-rhbz-2136459-throw-a-volatile-at-it.patch +Patch4: 0001-Resolves-tdf-151699-show-hide-the-overlay-along-with.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch @@ -2267,6 +2266,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor &>/dev/null || : %{_includedir}/LibreOfficeKit %changelog +* Thu Nov 17 2022 Caolán McNamara - 1:7.4.2.3-2 +- Resolves: rhbz#2143431 fix autofilter missing search entry + * Thu Oct 13 2022 Caolán McNamara - 1:7.4.2.3-1 - 7.4.2 release