diff --git a/bsc1177955.diff b/bsc1177955.diff new file mode 100644 index 0000000..a0b5480 --- /dev/null +++ b/bsc1177955.diff @@ -0,0 +1,136 @@ +From e80fb99133a8edf4c0b03319c7296889b0e52d54 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna +Date: Wed, 20 Jan 2021 11:15:34 +0100 +Subject: [PATCH] bsc1177955.diff + +This is a combination of 2 commits. +This is the 1st commit message: + +loplugin:flatten + +(cherry picked from commit 2d582244680e7f6dec6e4a466e276f93ccb01dc9) + +This is the commit message #2: + +oox smartart: composite algo: handle right constraint when left+width is given + +The bugdoc had this constraint: + + + +While img has no "r", it has: + + + + +Which is enough to fix the x position of the text to not overlap with +img. + +(cherry picked from commit 1359e8c566970fcef860f7ba7f54a07d8e6e0513) + +Change-Id: I80db290bd1695884ffb7b1eabaffa09462e8883d +--- + .../drawingml/diagram/diagramlayoutatoms.cxx | 78 ++++++++++++++----- + 1 file changed, 60 insertions(+), 18 deletions(-) + +diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +index 24acaf176491..3492ccefaa1a 100644 +--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx ++++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +@@ -452,6 +452,37 @@ sal_Int32 AlgAtom::getVerticalShapesCount(const ShapePtr& rShape) + + namespace + { ++/** ++ * Decides if a certain reference type (e.g. "right") can be inferred from the available properties ++ * in rMap (e.g. left and width). Returns true if rValue is written to. ++ */ ++bool InferFromLayoutProperty(const LayoutProperty& rMap, sal_Int32 nRefType, sal_Int32& rValue) ++{ ++ switch (nRefType) ++ { ++ case XML_r: ++ { ++ auto it = rMap.find(XML_l); ++ if (it == rMap.end()) ++ { ++ return false; ++ } ++ sal_Int32 nLeft = it->second; ++ it = rMap.find(XML_w); ++ if (it == rMap.end()) ++ { ++ return false; ++ } ++ rValue = nLeft + it->second; ++ return true; ++ } ++ default: ++ break; ++ } ++ ++ return false; ++} ++ + /** + * Apply rConstraint to the rProperties shared layout state. + * +@@ -468,26 +499,37 @@ void ApplyConstraintToLayout(const Constraint& rConstraint, LayoutPropertyMap& r + } + + const LayoutPropertyMap::const_iterator aRef = rProperties.find(rConstraint.msRefForName); +- if (aRef != rProperties.end()) ++ if (aRef == rProperties.end()) ++ return; ++ ++ const LayoutProperty::const_iterator aRefType = aRef->second.find(rConstraint.mnRefType); ++ sal_Int32 nInferredValue = 0; ++ if (aRefType != aRef->second.end()) ++ { ++ // Reference is found directly. ++ rProperties[rConstraint.msForName][rConstraint.mnType] ++ = aRefType->second * rConstraint.mfFactor; ++ } ++ else if (InferFromLayoutProperty(aRef->second, rConstraint.mnRefType, nInferredValue)) ++ { ++ // Reference can be inferred. ++ rProperties[rConstraint.msForName][rConstraint.mnType] ++ = nInferredValue * rConstraint.mfFactor; ++ } ++ else + { +- const LayoutProperty::const_iterator aRefType = aRef->second.find(rConstraint.mnRefType); +- if (aRefType != aRef->second.end()) +- rProperties[rConstraint.msForName][rConstraint.mnType] +- = aRefType->second * rConstraint.mfFactor; ++ // Reference not found, assume a fixed value. ++ // Values are never in EMU, while oox::drawingml::Shape position and size are always in ++ // EMU. ++ double fUnitFactor = 0; ++ if (isFontUnit(rConstraint.mnRefType)) ++ // Points -> EMU. ++ fUnitFactor = EMU_PER_PT; + else +- { +- // Values are never in EMU, while oox::drawingml::Shape position and size are always in +- // EMU. +- double fUnitFactor = 0; +- if (isFontUnit(rConstraint.mnRefType)) +- // Points -> EMU. +- fUnitFactor = EMU_PER_PT; +- else +- // Millimeters -> EMU. +- fUnitFactor = EMU_PER_HMM * 100; +- rProperties[rConstraint.msForName][rConstraint.mnType] +- = rConstraint.mfValue * fUnitFactor; +- } ++ // Millimeters -> EMU. ++ fUnitFactor = EMU_PER_HMM * 100; ++ rProperties[rConstraint.msForName][rConstraint.mnType] ++ = rConstraint.mfValue * fUnitFactor; + } + } + +-- +2.26.2 + diff --git a/icu68.patch b/icu68.patch deleted file mode 100644 index f6fec1b..0000000 --- a/icu68.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard -Date: Sun, 1 Nov 2020 18:30:49 +0100 -Subject: fix build with ICU 68 - -use standard true. - -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope - 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); - | ^~~~ - -/usr/include/unicode/umachine.h says: - -@deprecated ICU 68 Use standard "true" instead. - -Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 -Tested-by: Jenkins -Reviewed-by: Eike Rathke ---- - i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx -index b7ae49fbd96e..59ee46fa0e0f 100644 ---- a/i18npool/source/calendar/calendar_gregorian.cxx -+++ b/i18npool/source/calendar/calendar_gregorian.cxx -@@ -347,7 +347,7 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) - "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); - int32_t nZoneOffset, nDSTOffset; - UErrorCode status = U_ZERO_ERROR; -- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); -+ body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status ); - if ( !U_SUCCESS(status) ) throw ERROR; - status = U_ZERO_ERROR; - body->setTime( fR - (nZoneOffset + nDSTOffset), status ); diff --git a/libreoffice-7.0.3.1.tar.xz b/libreoffice-7.0.3.1.tar.xz deleted file mode 100644 index b80c1e9..0000000 --- a/libreoffice-7.0.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d -size 240706432 diff --git a/libreoffice-7.0.3.1.tar.xz.asc b/libreoffice-7.0.3.1.tar.xz.asc deleted file mode 100644 index 5d00666..0000000 --- a/libreoffice-7.0.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QnGgACgkQ9DSh76/u -rqOysA//XIy+t4uVuY0GN8L0ux5tskqI+zY/0KLYwNSX+oVCxs+LrQwInH+NfXRm -ewEy7hlZKjX8QtSAfKp+r0ljMk7gfRMdtQpnr+WZANx/2T9oUyPHkeDBP40u6J8P -Q4d9W9XGBTQGDgO/j6wRWGgHIdrFh87rcfkMnGAOsUMOiXGhqMZ07+1E8bVqSiro -gGGxZR1WH5DaLKUwJNzLNIi2rOqSNsHGbXcpEePo8Qa6fdAeS10/SaZg7GdjjF+p -RtWue7fmA+SQl4AOKN/Vme1IF0NDAcNwg7aa2HoNYSRVwyZItfp5S+hiZbRCiRGm -aI2RRBBEVCOBqI1nPkHT2va8+8VDeQt+dDOMWbAKXPd8IzSRCKztyhLzY6ty8eSF -8B5524hgiZZLxt2T+Rb4k8u0MopBc/F85chLW840+PhwzuzJjMBEtSXUU4Cz/e14 -StApJlSyhqjLmZLyFQKsxJWfHNor/QILz3N3QXD+OJewp4R7z0FfbuRHU2xfoOc+ -GSlIJqnQiYowul6IeY0zhqidnRAOAzIHFZaZZbjf5wGcJ9S48xfOC3q+TEjvHEp+ -WkC8ONpr+UFRrz8yj/ZonCm3mSzDCDtQUaPsdrm0PfXeVC+KgKwdY14Z6hpkbnJH -4Yc314hKvUgcbfut3pfZTrjpq9T+xo0eKdu81wQyalBbqk3xpHE= -=4ssw ------END PGP SIGNATURE----- diff --git a/libreoffice-7.0.4.2.tar.xz b/libreoffice-7.0.4.2.tar.xz new file mode 100644 index 0000000..61075a8 --- /dev/null +++ b/libreoffice-7.0.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fa9d2cc8d02f12b1f302b93056d5c0ff986090a6f309bafa506ba53779f2abd +size 236477520 diff --git a/libreoffice-7.0.4.2.tar.xz.asc b/libreoffice-7.0.4.2.tar.xz.asc new file mode 100644 index 0000000..2c5fd56 --- /dev/null +++ b/libreoffice-7.0.4.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/RI2oACgkQ9DSh76/u +rqOXKg/9FeoKe06dAcmxnSNF0w+hVzWYG/EaGz1aJKFu8F79z+i5/djeX1+esraH +DC8tB6kTYFf2i3cTYT2JfjDfwwpHEKENPeePxLa8LQROmpDklK6X76s+ZgKZ/XAx +rQj/RojCCKVcdLZ9qq9MtNndQZ9gEjMZLsj6ZPw+LWAtJzLPzu9cY7FzCg5HtT88 +EX/1OKUe9yW+Xeasg8zv7cqmg/NgAr+zV76/eSwd6XHbnlHVAkTX+TpQw9woi6yb +5MsNsnpQNUi2/OVm8+NaXOsW2aCXPPrwSWR9M9Zntd5N3H+syTQdWwzBXYih8v9l ++oLxGeWa0+Cyx10FvrGe1bGZROlK75VHQXMyefaDoi6aDUnRs25y3fppyISRQBoy +9sIt9a355+DiUuxhOwSpn1Myf0gXO3gTjFvNF5yZ+9OQe50Fvp4X508OhRPt4kaQ +vKoWTAKc+bq1L29jhlgjnspretarJYJoyAvtSYee+vuMrpn9N63Gvkvp5YAw+Cmp +dK1l7Q3oMYtBid9JTupW3NRTIDjTGn/8HlMeyHE+09G4qG4f81e8B1ZFxt/+35Ba +SHl1mx+9Kq+9YHPD1XLXetLYh7EWH8+e0UN0Cgc7SxvWQFhi3iZ5s8+UZ5RasWzh +cEt+Ih+GTqhPk+1NuloxtJ66VNhdOa4KxQoO/HOMCsJCtVXMdtU= +=PY7u +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.0.3.1.tar.xz b/libreoffice-help-7.0.3.1.tar.xz deleted file mode 100644 index 1fd5bc8..0000000 --- a/libreoffice-help-7.0.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb1ce39cb90b7c04f69af6f47c75cb65526634315d12230e638e3a561b9b9293 -size 110855688 diff --git a/libreoffice-help-7.0.3.1.tar.xz.asc b/libreoffice-help-7.0.3.1.tar.xz.asc deleted file mode 100644 index f1eb7d7..0000000 --- a/libreoffice-help-7.0.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QnHQACgkQ9DSh76/u -rqPixg//TJcMndSmfLrfDz3NB8HICD4IQ6SD/zq5Lyq0Q02l60BFBHgZKyYbVNqy -ojmp4muEPOtrE6pr9DllCl7c7NiYDrzGFW4ZSB7QrMMV0oXUbrvvFDMuir/ATHkY -+xTlW3qEyS4cvp48HpVn7JonYM3VdQn3GAIqmKuos2giE62r8205NOozdluUo8pn -oZ/6H50Gluh+zn4piBP0gaah/+FNigo9pb5EibOqXu6DcIANyP5cWYn9mRfdF21P -aHBH6Xrpj6ux5Rntt7FA112k78SMdQWst6H38/Sifi6bG1Lby5MifnQALgNze6VH -cTxtUnV+740NRlMjkyYh7niJAKj+HK0Px9LlkBeVsTvQwmrF6iKvz1JCRCCjLYtm -IP7Y/T+qYgsLcQwKknGoL0HVbiSjwP+EkneJ074gi4t8Kj8AkdkdD9EBsMrln+ZS -HLqDukLQZ4xc1TQSKaONZUToObkBFpoxDNW19WHf5rCn0ghayXB34hfS3GYg+Vfr -kD/N+PNnJT6KValFPGwHbH3rlSzwR29TLqlZ1Bxl9W0QVP18V4wYj++ThVX5CtPi -5XB4/k15tpfAGmzoSTXpyCm0Ni4XXKKsEZqpxB/cJPnpvlCvvuLemzgq4GckA8sk -oo71XM75WAr5RpCanVrqZucJNZIxVlYbWDf9PQ/6Cjg+sJg2OmE= -=DD7E ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.0.4.2.tar.xz b/libreoffice-help-7.0.4.2.tar.xz new file mode 100644 index 0000000..c7582f4 --- /dev/null +++ b/libreoffice-help-7.0.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b6353221594937c482eaad078c67139455776bce6ab42df9b22709ed271e9da +size 110758084 diff --git a/libreoffice-help-7.0.4.2.tar.xz.asc b/libreoffice-help-7.0.4.2.tar.xz.asc new file mode 100644 index 0000000..8d83f61 --- /dev/null +++ b/libreoffice-help-7.0.4.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/RI3MACgkQ9DSh76/u +rqONrBAAhl/c0TmAhHZ5M/iIcZrOwzpcM6LOCUNXT5WW8pUgRPnmYMil82ejQ9cL +SpG240LK5Vn+8pJrEnSfxvFxnhadXzCsDoM2LKevMznLXaIKD1AxbxkUqqcyktgh +U8xeA1QCX2B3ihLZiTNttrGkvo/GLDtKzeE9xVHARVQtI+xDeAHTDp+2PQmyTyoG +D7NeeNy4GRwQFKG25NLq06U2e39WvlFtuZz/c9UbzTZuRVKY2p8gYAt1hMzP/l3o +g6jRs0fTYOwLPz7qA95wujY2WL30ZV032l/1TIHN/fBLk07wJpjtStM9aQgvu+BA +dVqFEKUVbz7xx1rhMMW7nVI5zBi9TTn1421/TGCZnqtwplO83HHflMKO+PGOtKNe +u2B44F+c6+zSlc+XcWnmiuhRlIW7M8HU4x5q/0LMLn9KNd6Y4WHyIITvnV6I3gW2 +mQpslxDRFHhCXZIy/ZOWF+ZHr+YwOfDIPCTgo/hIsXHZ3nri+RdjNFkPdx+0b4nD +aWHiSrM3CRS8oIsrmZeDnPEXRGVhiAebeqQT/ned5VS8JFVXWEa8fYnz/onh3hDp +2ryhq4EKOc/MO7q5XQJ8suvvB11hcJlkVrWmz0rEPdu1jGPjdrharK1yDgUHvKx2 +bLG4xTtMXnDTXZDYKZXqMHpuSgXdqA/Pa2fU391QTsmATWtc1nU= +=wZP+ +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.0.3.1.tar.xz b/libreoffice-translations-7.0.3.1.tar.xz deleted file mode 100644 index 6bd09fa..0000000 --- a/libreoffice-translations-7.0.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:442a2a1931549edbdbc6ab8f9fbc6b8e7088fde4d5806cda82263080d3617168 -size 175131584 diff --git a/libreoffice-translations-7.0.3.1.tar.xz.asc b/libreoffice-translations-7.0.3.1.tar.xz.asc deleted file mode 100644 index f070bb8..0000000 --- a/libreoffice-translations-7.0.3.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl+QnHUACgkQ9DSh76/u -rqOCohAArYb1YOQgjD49R12EXtUFAxvZH+ihTjFOXxgpnZCv2Zy/2EedtELZebHP -hubWG0XrDW/DhrHxdv3FDk4QZrbRO5Pa1Pe9NPkskCB/3R3hahzmoSzFscCKaGfA -ETpZyv3jBB2d6TUFp/P5QATAH1UkLbsJJy6wX+vdF8Uth7t9cJLRPd17sCv5Xxfa -F32eYge52T3oThrk8SEG0+LLNARz1YM7pxopwi5GSBMs5jpech/80tK3Xa+LFJEb -IcXtoJw3wwy3V+pW4LQvYJiNlBaZSV4r9ofTDB6D02ugL6V1bpHaqCs+1NZF9za/ -6gLh03URbgNDCPyr83ZMm29HWs3ezh8nm2YcO98nK4l+K2K9sWqY0iMmTHLRDF2S -R8K3KzFQcDy27nmYGWYaZ1dBIOaMO9C3CYK3vPRtqU9FGQpWnz+D6zZ5UL1CSSe7 -TMo0ad3ZBUpuzyY1gs0SD/vkyAn2z+c/rFwwg1gKRkE7HFS6fe7pNvC50W+FaYC5 -HMludCEIm3vUdvHTAbEpaKSZKEx6fAT716O3FMLCRFeDZg81RHslQhorHHoTpo22 -XzrUcH+c0BEQ7Q6w+Yv4eNyPinjKXxhpGg9CkULfGU8C6NS0xr/8fQ25uZbsHNH3 -JsUIaPmob/07nvDeJaZgYA5BnKNLx4q0MsB5QPBoA/TQcp+O2lk= -=yaFn ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.0.4.2.tar.xz b/libreoffice-translations-7.0.4.2.tar.xz new file mode 100644 index 0000000..87cafd5 --- /dev/null +++ b/libreoffice-translations-7.0.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:544b1a1b4ca795842fb0e4e5eee68f94dd16b10ca4c3c84b1be85467cabc73ec +size 175341984 diff --git a/libreoffice-translations-7.0.4.2.tar.xz.asc b/libreoffice-translations-7.0.4.2.tar.xz.asc new file mode 100644 index 0000000..dc7ad4a --- /dev/null +++ b/libreoffice-translations-7.0.4.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl/RI3QACgkQ9DSh76/u +rqMVaRAAp0ojV+HOEpLbwY7vm0tdUszOjRE/ytynpUfMvF83/Ddn2yLh6TDHeq92 +wcd7VZVGonclX3w8rmpVD2TPCK0a6AWSMHS1p1HOhz4nDP5u796xgHrDS6dhfMYS +xLOA4yh2HB2e+Zb968W7qSnGFBtVI68qk4qb0g/eJSThoMeFhoij1EGBynzAVlZX +2jxBOcSreQgJFhrlFQH8/z1r6e1CrVFYpwWJKDJe3bSxwlGC/EEmDILqiSop60Cd +8k7sIcVCjb0dHMGgEsuApDXYEC3tho9eC1HVqXdYj8th9AxfTcT5oXnia86rOxuF +IAG2a/Rh/PopsM7Yp5ftQOump69B+mk5l1rFU1z1IjU2Ac8zCwuPqYz3YtUINJsW +fjJ9ssO+pFr/UD9ZuzrOTIlQfvLxWg7gRRjwVNqLew0TbhbZ+8KZEdYLHa3zwCyq +u1h2LLVTU17hY6NkgmkDvUiK3jufUZHQhjR7AfM844d2t7CBDVLk2ODqmCr1t3lh +4eSbBxSvm07vehyhekkvWeJ0av9HNOSQcNWoh5hP4qELw3NbGUo5un7gyKOFudGn +LjmW228clij4dUefsL8R44YutsK7sqh8yKfLNFutJ6zZ0qbdpr6pDxIon4VGEfnK +Ib85nxqs3Mx3SnhfUiP+g/GfJLvLyltxnLtrbugeVgu13hxN0sw= +=osXC +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index e8a10d2..5d2c010 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jan 28 21:17:13 UTC 2021 - Andras Timar + +- Fix bsc#1177955 - LO-L3: SmartArt: text wrongly aligned, background boxes not quite right,... + * bsc1177955.diff + +------------------------------------------------------------------- +Sat Jan 23 22:55:19 UTC 2021 - Andras Timar + +- Update to 7.0.4 + * .4 bugfix release of 7.0 series +- Removed patch: + * icu68.patch + + integrated upstream + ------------------------------------------------------------------ Thu Jan 21 07:22:58 UTC 2021 - Yifan Jiang diff --git a/libreoffice.spec b/libreoffice.spec index 4778327..4e28e08 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -46,7 +46,7 @@ %bcond_with system_gpgme %endif Name: libreoffice -Version: 7.0.3.1 +Version: 7.0.4.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -87,7 +87,7 @@ Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zi Source2006: https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar Source2007: https://dev-www.libreoffice.org/extern/odfvalidator-0.9.0-RC2-SNAPSHOT-jar-with-dependencies-2726ab578664434a545f8379a01a9faffac0ae73.jar # PDFium is bundled everywhere -Source2008: %{external_url}/pdfium-4137.tar.bz2 +Source2008: %{external_url}/pdfium-4306.tar.bz2 # Single C file with patches from LO Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way @@ -103,12 +103,12 @@ Patch4: 0001-Upgrade-liborcus-to-0.16.0.patch # LO-L3: Shadow effect(s) for table completely missing - part 1 and 2 Patch5: bsc1178944.diff Patch6: bsc1178943.diff -# Fix build with ICU 68 -Patch7: icu68.patch # Bug 1178807 - LO-L3: Text box from PowerPoint renders vertically instead of horizontally Patch8: bsc1178807.diff # Bug 1179025 - LO-L3: LibreOffice crashes opening a PPTX Patch9: bsc1179025.diff +# Bug 1177955 - LO-L3: SmartArt: text wrongly aligned, background boxes not quite right,... +Patch10: bsc1177955.diff # try to save space by using hardlinks Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep @@ -969,9 +969,9 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %patch990 -p1 %patch991 -p1 diff --git a/pdfium-4137.tar.bz2 b/pdfium-4137.tar.bz2 deleted file mode 100644 index 3cc8fc3..0000000 --- a/pdfium-4137.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6 -size 7198680 diff --git a/pdfium-4306.tar.bz2 b/pdfium-4306.tar.bz2 new file mode 100644 index 0000000..fe47d8a --- /dev/null +++ b/pdfium-4306.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8 +size 7220464