diff --git a/0001-Revert-rhbz-1931423.patch b/0001-Revert-rhbz-1931423.patch new file mode 100644 index 0000000..4cff30f --- /dev/null +++ b/0001-Revert-rhbz-1931423.patch @@ -0,0 +1,76 @@ +From 40b4b2f530787cdf23414df99b4e6591ad5e1d5c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= +Date: Mon, 3 May 2021 14:52:34 +0200 +Subject: [PATCH] Revert "Resolves: rhbz#1931423 start update timer in IM + events as well as keyevents" + +This reverts commit f7243a465fc75f8c29c1decb7628f7a8f6d1d769. +--- + starmath/inc/edit.hxx | 1 - + starmath/source/edit.cxx | 24 ++++++++---------------- + 2 files changed, 8 insertions(+), 17 deletions(-) + +diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx +index 60d0ad2bbb04..300a414d382b 100644 +--- a/starmath/inc/edit.hxx ++++ b/starmath/inc/edit.hxx +@@ -88,7 +88,6 @@ class SmEditWindow final : public vcl::Window, public DropTargetHelper + void InitScrollBars(); + void InvalidateSlots(); + void UpdateStatus(bool bSetDocModified); +- void UserPossiblyChangedText(); + + public: + explicit SmEditWindow(SmCmdBoxWindow& rMyCmdBoxWin); +diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx +index 99ce7c008622..64d1fc34757e 100644 +--- a/starmath/source/edit.cxx ++++ b/starmath/source/edit.cxx +@@ -365,10 +365,7 @@ void SmEditWindow::Command(const CommandEvent& rCEvt) + if (bForwardEvt) + { + if (pEditView) +- { +- pEditView->Command(rCEvt); +- UserPossiblyChangedText(); +- } ++ pEditView->Command( rCEvt ); + else + Window::Command (rCEvt); + } +@@ -479,7 +476,13 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt) + } + else + { +- UserPossiblyChangedText(); ++ // have doc-shell modified only for formula input/change and not ++ // cursor travelling and such things... ++ SmDocShell *pDocShell = GetDoc(); ++ EditEngine *pEditEngine = GetEditEngine(); ++ if (pDocShell && pEditEngine) ++ pDocShell->SetModified(pEditEngine->IsModified()); ++ aModifyIdle.Start(); + } + + // get the current char of the key event +@@ -507,17 +510,6 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt) + } + } + +-void SmEditWindow::UserPossiblyChangedText() +-{ +- // have doc-shell modified only for formula input/change and not +- // cursor travelling and such things... +- SmDocShell *pDocShell = GetDoc(); +- EditEngine *pEditEngine = GetEditEngine(); +- if (pDocShell && pEditEngine) +- pDocShell->SetModified(pEditEngine->IsModified()); +- aModifyIdle.Start(); +-} +- + void SmEditWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) + { + if (!pEditView) +-- +2.31.1 + diff --git a/0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch b/0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch deleted file mode 100644 index f1b2c33..0000000 --- a/0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bb3489cabed5ea168ae210ec9aecf3608a270e1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 30 Mar 2021 12:11:42 +0100 -Subject: [PATCH 2/2] fix the endif placement for GTK_CHECK_VERSION -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I1ff3f3c32990947a353c5908665b156d87d8ff58 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113346 -Tested-by: Jenkins -Reviewed-by: Caolán McNamara ---- - vcl/unx/gtk3/gtk3gtkinst.cxx | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx -index f29c0c018ad3..773b20ac5b07 100644 ---- a/vcl/unx/gtk3/gtk3gtkinst.cxx -+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx -@@ -7783,8 +7783,8 @@ private: - - gdk_event_free(pKeyEvent); - } --#else - else -+#endif - { - guint nButton; - guint32 nTime; -@@ -7806,7 +7806,6 @@ private: - - gtk_menu_popup(m_pMenu, nullptr, nullptr, nullptr, nullptr, nButton, nTime); - } --#endif - - if (g_main_loop_is_running(pLoop)) - { --- -2.30.2 - diff --git a/bsc1182970.patch b/bsc1182970.patch deleted file mode 100644 index 5baaf8a..0000000 --- a/bsc1182970.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ff751d42a4f672e25188ba90958e91d7869f395a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCl=C5=9Fah=20K=C3=B6se?= -Date: Mon, 22 Mar 2021 23:39:17 +0300 -Subject: [PATCH] tdf#140714 Import graphics cropped into custom geometry as - custom shapes. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Change-Id: I2054d24ce41c9f0d6cc1675f461274067c3b2898 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112943 -Tested-by: Jenkins -Reviewed-by: Jan Holesovsky -Reviewed-by: Gülşah Köse -(cherry picked from commit db39b68c3c85531744ddeb8105b3ddb9b2dab099) -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112811 -Reviewed-by: Xisco Fauli ---- - oox/source/drawingml/shape.cxx | 6 ++++-- - sd/qa/unit/data/pptx/tdf140714.pptx | Bin 0 -> 28384 bytes - sd/qa/unit/export-tests.cxx | 16 ++++++++++++++++ - 3 files changed, 20 insertions(+), 2 deletions(-) - create mode 100644 sd/qa/unit/data/pptx/tdf140714.pptx - -diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx -index 5f3204bf64f2..ffa7fb017aca 100644 ---- a/oox/source/drawingml/shape.cxx -+++ b/oox/source/drawingml/shape.cxx -@@ -722,8 +722,10 @@ Reference< XShape > const & Shape::createAndInsert( - } - // Use custom shape instead of GraphicObjectShape if the image is cropped to - // shape. Except rectangle, which does not require further cropping -- bool bIsCroppedGraphic = (aServiceName == "com.sun.star.drawing.GraphicObjectShape" && mpCustomShapePropertiesPtr->getShapePresetType() >= 0 -- && mpCustomShapePropertiesPtr->getShapePresetType() != XML_Rect && mpCustomShapePropertiesPtr->getShapePresetType() != XML_rect); -+ bool bIsCroppedGraphic = (aServiceName == "com.sun.star.drawing.GraphicObjectShape" && -+ (mpCustomShapePropertiesPtr->getShapePresetType() >= 0 || mpCustomShapePropertiesPtr->getPath2DList().size() > 0) && -+ mpCustomShapePropertiesPtr->getShapePresetType() != XML_Rect && -+ mpCustomShapePropertiesPtr->getShapePresetType() != XML_rect); - bool bIsCustomShape = ( aServiceName == "com.sun.star.drawing.CustomShape" || - aServiceName == "com.sun.star.drawing.ConnectorShape" || - bIsCroppedGraphic); diff --git a/libreoffice-7.1.2.2.tar.xz b/libreoffice-7.1.2.2.tar.xz deleted file mode 100644 index 4e343a9..0000000 --- a/libreoffice-7.1.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ba58991f626dc42c75ca2c28f91915ffabae18ba5a5fba5344ed7004eba29f8 -size 243806936 diff --git a/libreoffice-7.1.2.2.tar.xz.asc b/libreoffice-7.1.2.2.tar.xz.asc deleted file mode 100644 index 9a22945..0000000 --- a/libreoffice-7.1.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmBbbf4ACgkQ9DSh76/u -rqOjMw/+OMIJPkPgTvvSlUIiRGeUV7I08mB3jN1yH11wkJ39FFJ7jWDSWtVzXegq -v8E5ZmvCTSa//erR5vX5LK/5tjSJkxX9O44MThBcY0mzafi0H3PQk1WRteXCf2K9 -Q1CNzGoi7Wyj6iRV34uvwYs9PapcHLj21BuiVOIJ3s8m7CaRizMmppQuFb4/BUsQ -eMryFc/c5j7MOk00Uwrxq8W4AlN4typmarCAwIx5KRzOpsWcwxOFbDaHXUWfNje/ -jTdbWUdbdMmxBUjkCbNI9P5W0JoI47LATUa9PKN8eHWK+AXda6oiFxwawpmb5295 -cpFF3V9wkag3VOidq/YjEvfRzBGmlYGuV2A6ziAfAGpQwDFy0i3Bzwkm5U0zAQtC -GXsFhhDoMlJSHB4uG0iyKswvGeuPdz3RseRwoZk1I+2aQr89oTcHhCw4XMeSHyji -s3B5V1Yu9W2OcKQL16RnMb3hb1WXAQV9PQETKfljT7AVZ9ayVxNbLjmwnefkADwd -ZpnRA3r4LdAKXL53fqlTm5EH2ot6H60NB1mWt/pwlbeMGaD4OE8eG7fAcfxExFCU -ul/27bShl0PnUab/SfVpuaj5KHocCb7Dh5u+x5cO4f9K+jU+7RoftXxz84DpVtrD -8rwuzPRwTl3YuZD30Hj1/iOmBE5PlkTi4lvjzo9Xh/P0MxIbRZI= -=D3Ax ------END PGP SIGNATURE----- diff --git a/libreoffice-7.1.3.2.tar.xz b/libreoffice-7.1.3.2.tar.xz new file mode 100644 index 0000000..80523f8 --- /dev/null +++ b/libreoffice-7.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35af7fd104b253704f770a205f835aee0e82ccc889ebf0949a89d9b3276229bf +size 244104432 diff --git a/libreoffice-7.1.3.2.tar.xz.asc b/libreoffice-7.1.3.2.tar.xz.asc new file mode 100644 index 0000000..f8e46c0 --- /dev/null +++ b/libreoffice-7.1.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmd0ACgkQ9DSh76/u +rqOeHQ/9EWVwuLTeEzTp4C1QmD/azlT4Y/DSyfTJ3nnTFtReHpXLDeqRfeFSE2sh +33v+tvAN6BOQkWV8YwkMG0AECuQjGgM+rUADSibosbJMStSxIUswY/lqqYzUl6w4 ++L2Yk28XyaxPcE5izKh7fPXLhg0KeyePkNE+RQcoKQP3QXWFIRM/Sb6cMx8NzyMH +1iow3FLeyylzrDJaP+wbg639myrAWph85xFLMaeCyTrUXaMuTOUZ0LjpeCbY8MQz +NbwYKNr3QrrTOVI3UmT5g4/DT/hncsI9KFQkB9I8rVqtonBr+RZSK1SunuelKx0r +0hu1NmAjwm1Rv+H1C2L/Qi/ZUpkgnC605VkS5RSmgzl74rd4veh6+KdeTQKhjDnn +UzDlpXVEo1soWH3qqyQMtsJGUYVvB9EiC5JL4YGvrBJMQ25xJ5GbhU0HoBYITY9M +ngUFwGgj2DpFRQCbIItSDJkJ3IjLzyIFm5ZfsH4QTB8JAFsez3LAQMymUBryhlkp +uhN53DVFqoiWazx2Yqbt4lbHTiFS9HLwb95YyfLPdomV0Ng9iIsHeGYwYUAPcNSh +S3AJvhM62ZyKIIZfOa+vk6NBGAlNnhqUOK9qdFC/v7Jyqr3iZS/zEFRWfldJcEkC +9/HV9E5mjDOCPd61IlGmVDB2HJt5v8CLldIBmgg+IkgFKqOmH+Y= +=c9zE +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.1.2.2.tar.xz b/libreoffice-help-7.1.2.2.tar.xz deleted file mode 100644 index c0bd72b..0000000 --- a/libreoffice-help-7.1.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e5b980d453793308b49e9ab9100738394f5c9dfaed5a94eacd95f087f9d59af -size 111784492 diff --git a/libreoffice-help-7.1.2.2.tar.xz.asc b/libreoffice-help-7.1.2.2.tar.xz.asc deleted file mode 100644 index b71299e..0000000 --- a/libreoffice-help-7.1.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmBbbgQACgkQ9DSh76/u -rqMXlg/+Irv/C0ybdtJqYYlp2JaOTFQ6x5cFjV4pym30VhPWJgblyibKBI4dWuvh -GB827C+ZNaMwYNdBgVj08oyRAe4PiL1VagfybiwI1hR4KMNVzVolG+5RqdacAwqN -OiY93qL7pJG5izoWecT1KwmabmQ1llmgyp3shalPLBmyT/VqwlVYyq2khPaAmgFy -hWHjKbFdwXOLYGXapd7IQsFjvX6CgSKeSIqzDmGV9a9Z1bMTjUQ3DOHoak05eyfl -0JF/q+Kr6xX/EVM+2fu0UZbaFk5/T1ERkH+phLye258R0ioyneIPE51TIubNjUz/ -dY8v8BwmyZ+seicWdTRyBKTJYDTZegP/FjePD9770g2GjZerClsF646TbJiv+0FD -nqo3iQ+ANqSkJznbdrQlxE1UAF8G+ji/WnJqDttP01L2hjvvILWV7m6ZDiBhPB/v -fqQpgI/PynT5pf7V4hz5a4Gcj4BNEHsfQIv8V3efSMcX42vwyJ+bWIK8bggVVpWN -Wyi6nzAc5B42yQI3zNvNFdqo9kcPjHlqTofnIbUFkfClHTiNuMCgVuhGh8sL+9jM -+xJVK3oQ9VkPrkipah1YcNHLc3nLwcZHKbIetD7azTGHU8YEETcpN2D++eZ98ykJ -DziTj/7dn/DL9+lvMfvcYeEgQHOBiI/Pisl+uydxr6EsA32QWcQ= -=f/cB ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.1.3.2.tar.xz b/libreoffice-help-7.1.3.2.tar.xz new file mode 100644 index 0000000..977e5ae --- /dev/null +++ b/libreoffice-help-7.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0f14b4db1585506761ad2ceeb43850cb594f2ec8a20fc9ca7bcb95e77408935 +size 111785416 diff --git a/libreoffice-help-7.1.3.2.tar.xz.asc b/libreoffice-help-7.1.3.2.tar.xz.asc new file mode 100644 index 0000000..3b9cda6 --- /dev/null +++ b/libreoffice-help-7.1.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmeQACgkQ9DSh76/u +rqO7Hg//QG0EMbDa6CQL0gPfGDjp4PIbV8//wPVIwvBJPqd5lgzFh3xQfWUHO7h1 +N/1CQ2fHeqrkp+LTRqjghxn0ShNbWD6xILjPDpjNfC+eoD2MRLJuxni55Xzj6i6X +Y1vagDf80Vc2fHH0/a2nNndSV2UuVCvyLsdnQMgzHTtaSnGt0DBHnCYm3P4clb7r +pOEXSF/pRuTvRzzGHMhXaTQ6AfneBLkc9GIOOOa/elmR+J7GH8KyjAGLX7367hx+ +Fq8OXFXRcpQPBk/UfwHKF6PadLSp+ilruEiop7uSiuwdIiSAvnfmCegga74Y6MZr +PxcaTVl4m8opve7QzIg70K2dnQMexj5cITUUYuyiP6EoxrYftPN27C9LVZib1QL7 +AsLK50fSn+GDAEiVVmpwlfpxJvK7z8H6cT5hrQSEZCOHKsrSo/Vcn7vtbxMwf/p9 +lC+XJjju8Ord7S0FeUdUHbcpJ9gy652s0KsVR4cRq9V71QJKln0tthZW1UxmyLri +B0QbIrFPG4Vz1XTJWB3bd3SGdxnNrEU+wbnh1D2sMlwUYoUZDoYRwp1vu3sxrawb +QLvigaIxAxJcMRCnvtzaufUkWrU/cLS+2RY2rt3H1pX9cMbuCyzAjGSQt8rHAwdD +w/8QgXC1PITBdVABlxvtEaUSk+YGHSLDBFRviU3hIFjhX5jVJds= +=3/LI +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.1.2.2.tar.xz b/libreoffice-translations-7.1.2.2.tar.xz deleted file mode 100644 index 9227fd8..0000000 --- a/libreoffice-translations-7.1.2.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a724be1fb8895ad14d1e1e6558d1bb65037d1f15858bd48228ad0cb66828a2c8 -size 184782132 diff --git a/libreoffice-translations-7.1.2.2.tar.xz.asc b/libreoffice-translations-7.1.2.2.tar.xz.asc deleted file mode 100644 index 5ed5362..0000000 --- a/libreoffice-translations-7.1.2.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmBbbgUACgkQ9DSh76/u -rqPjiRAAxr6Lay7Q5dQyX2B7uzzMEtooorqsxoq81txdsiCgE2M28ZD30jDaRxRr -KE2jB73qtDfNqMTZPCNC8x6xgWVbAdyb9jbpWZoKrfXy5G8I0FGRHLWB/AQL4L06 -9ExlOyp5OayaXXzosPv9destPlBFlncK1B/BZ5slZtd8EaKUGWQRgWfvL4nUQfcz -RJTeO6tuPeQaRVB4YhA+sL23QyS5JJG4K1YetaLd1Cj8BVXj+X58cTI8OIXhKhF8 -VPC4yLZuSbsCuvbvJBUoVSu7xGtMXBAleCO3UbwpAZqiE8harKx18nj3itmKLAOX -hot6BuabIRqCQnowejjPzPs1GUhbQUTEJzTXzMC7PkL9+BCMjOs7yHbk3TMGejO9 -RuWQ2xUgufSls2hwTLt0ghA5FBrV/1XYBYtseolFHiE3cZGIOnt1mc/CYL1dtdF5 -79e2VrClyfflRp950fXtRsm4iilDPbT4AY1qdXAJOcpUGMfkysaQ6FbK9cyX+Ha4 -PFK8NC43rBGSI4w5nU8SSoxQnTbq48DLDG0rYgI5mO5PMdHrXpajKj6b9FUvyYNo -nt5K0DkTymE8fioSs+eiuPb6s9/8FboF1qhhsT3rUwynUU907+/1Tf50fkbHwrn/ -v1za2dNljbHRFYKFMHH07QbCWFD0rYT450OL7a58uHddU9j/9f4= -=nvIA ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.1.3.2.tar.xz b/libreoffice-translations-7.1.3.2.tar.xz new file mode 100644 index 0000000..c5a50e4 --- /dev/null +++ b/libreoffice-translations-7.1.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86138935d274d46d27e4ce92a72d759e7d4491d7b227be952e05735ba5c9b327 +size 184886096 diff --git a/libreoffice-translations-7.1.3.2.tar.xz.asc b/libreoffice-translations-7.1.3.2.tar.xz.asc new file mode 100644 index 0000000..4d4b6aa --- /dev/null +++ b/libreoffice-translations-7.1.3.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmCJmeUACgkQ9DSh76/u +rqOUmA/9HRT5E660Lv+sx2UdKe8/UA+T63IZlkRJSdLcr4VJEEX9q0vf7vK+NLyx +9HFC6hswUwPj5hUyITWnxzGIaSCb0AWfmlgU37gi2GlZNthXSUHoxMWn0abLMrvY +jdmBVHij2Tz+9p5eHEOPHSUgiqO1icDAcZv57bgFaIOYAp0+e633oKSWuaIj/LD6 +ZFkNjrijydmY0EV+MsrDXgzQzfZ+MR02ruxm4QlU5UfI4g7JUxCumvXcw1em+FyH +TsfsfEWIB8vKmgSmzbzyLR8ELxC57ZCfYIFSy3Kc8G1DmYEThpdeKe6CmhegjG/A +xAqNkHeVnxqOUYiQGo/FOw4mE4F5B4Pkr34AfCrXBRlnMd9wakvngMtzaxKiNqwi +2zcgFY/8agenisXreLvC3UgwwLcJeg0q45bOz0rCJB4+lxhD9wlh747O6BeNkY5P +SeL1d964wkDNyliXxOUZ7+SaW6/FnBvtdt+JxJFRNvqH7ZkbjefleNbUZcCAw9vR +80hqde42Z5zLh5PlDsat+R9JG4xh1qfqAlBIEFX/ho5d9lFK5FPx0AgXQh2SRb8C +8TO7x7DmtM0M1K8kHos4me/mrGAZLFhO45dWKSrIACnjFodqNYb9X0bopgYaUB03 +/PvwVymsrU/K3bXX7EgJQyD0CM/XaGC/Jp54r4UxURyLeaTffPE= +=+y28 +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 27d93f5..a4441ea 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon May 3 09:14:37 UTC 2021 - Markéta Machová + +- Update to 7.1.3.2 + * 7.1.3 final release +- Drop merged patches: + * 0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch + * bsc1182970.patch +- Add temporary 0001-Revert-rhbz-1931423.patch (bsc#1184961, bsc#1184527) + * libreoffice oomath does not ask to save changes when closing document + ------------------------------------------------------------------- Tue Apr 20 09:31:35 UTC 2021 - Markéta Machová diff --git a/libreoffice.spec b/libreoffice.spec index aafaf02..50433c0 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.1.2.2 +Version: 7.1.3.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -101,10 +101,8 @@ Patch2: nlpsolver-no-broken-help.diff Patch3: mediawiki-no-broken-help.diff # PATCH-FIX-UPSTREAM https://github.com/LibreOffice/core/commit/f14b83b38d35a585976ef5d422754d8e0d0266a6 ucp: fix call to getComponentContext Patch4: use-comphelper.patch -# Bug 1182970 - LO-L3: PPTX: image styles that clip images into curvy shapes missing (and images shown rectangular) -Patch5: bsc1182970.patch -# Fix build against gtk3 < 3.20 -Patch100: 0002-fix-the-endif-placement-for-GTK_CHECK_VERSION.patch +# temporary fix for bsc#1184961 and bsc#1184527 - libreoffice oomath does not ask to save changes when closing document +Patch5: 0001-Revert-rhbz-1931423.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -975,7 +973,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch4 -p1 %patch5 -p1 -%patch100 -p1 %if 0%{?suse_version} < 1500 %patch101 -p1 %endif