From 627900c2b09873d5fe9b6dfa0695343a73e8e8f4777f8da7dd940fe7888bcad4 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 4 Mar 2022 09:14:32 +0000 Subject: [PATCH 1/3] Accepting request 959349 from LibreOffice:7.3 - Update to 7.3.1.2 - Remove upstreamed patch: * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch OBS-URL: https://build.opensuse.org/request/show/959349 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=993 --- libreoffice-7.3.1.1.tar.xz | 3 --- libreoffice-7.3.1.1.tar.xz.asc | 16 ---------------- libreoffice-7.3.1.2.tar.xz | 3 +++ libreoffice-7.3.1.2.tar.xz.asc | 16 ++++++++++++++++ libreoffice-help-7.3.1.1.tar.xz | 3 --- libreoffice-help-7.3.1.1.tar.xz.asc | 16 ---------------- libreoffice-help-7.3.1.2.tar.xz | 3 +++ libreoffice-help-7.3.1.2.tar.xz.asc | 16 ++++++++++++++++ libreoffice-translations-7.3.1.1.tar.xz | 3 --- libreoffice-translations-7.3.1.1.tar.xz.asc | 16 ---------------- libreoffice-translations-7.3.1.2.tar.xz | 3 +++ libreoffice-translations-7.3.1.2.tar.xz.asc | 16 ++++++++++++++++ libreoffice.changes | 7 +++++++ libreoffice.spec | 10 +++++----- 14 files changed, 69 insertions(+), 62 deletions(-) delete mode 100644 libreoffice-7.3.1.1.tar.xz delete mode 100644 libreoffice-7.3.1.1.tar.xz.asc create mode 100644 libreoffice-7.3.1.2.tar.xz create mode 100644 libreoffice-7.3.1.2.tar.xz.asc delete mode 100644 libreoffice-help-7.3.1.1.tar.xz delete mode 100644 libreoffice-help-7.3.1.1.tar.xz.asc create mode 100644 libreoffice-help-7.3.1.2.tar.xz create mode 100644 libreoffice-help-7.3.1.2.tar.xz.asc delete mode 100644 libreoffice-translations-7.3.1.1.tar.xz delete mode 100644 libreoffice-translations-7.3.1.1.tar.xz.asc create mode 100644 libreoffice-translations-7.3.1.2.tar.xz create mode 100644 libreoffice-translations-7.3.1.2.tar.xz.asc diff --git a/libreoffice-7.3.1.1.tar.xz b/libreoffice-7.3.1.1.tar.xz deleted file mode 100644 index 80c13be..0000000 --- a/libreoffice-7.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db554117cd690d48a2e69cb6190603981c9ba5e70d4bbe162f0ae31b397f1443 -size 255263512 diff --git a/libreoffice-7.3.1.1.tar.xz.asc b/libreoffice-7.3.1.1.tar.xz.asc deleted file mode 100644 index d42f1ad..0000000 --- a/libreoffice-7.3.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT40ACgkQ9DSh76/u -rqOpmA/+NV5aSLZw4naApHPyClF0ujVBKTFKprLtpeu+1mg32Z9+/9kW6FYr0Oev -iUxTCmzvzvhgWhmuZ6F25ibnHfmmn2zOjMy+SRV1B6fEqDnFJc3V/JYdBb+oLuSt -la31Uy8Qbt8mcSiO6pM9aox+g34DlRTXnf/JnHKY06mOMqggHeACzqjYncpspsOt -fmZhOcIMrkpxccchEel4AQxbLveJf7omFrCS1H4SEWapIog5I1hyC9S3iqQWgdtp -x4p3NEDqV+npjsbIjI4qUaQCpgQIBDClP4ivK1ESpWCoF4IvcrzgPXdFnc1H0c6d -kxD3vXd0TIX/mDOoWpz7AQM/HgHtLVkDHwEBZI9mdi8kLh8k9dNEA2hgiR8vfubb -fl2KMlQJxWqYEdoKpDEEMjMSp48fAyoz8b5CXuOBoowRJkFVYvtDanB5NXevMvws -h5bQGqk2RmYjI+20HNlgSbHZLIfqviiwECZdAK6TiVsU/UkNREwlgV0Aqb1OHOXf -rcI4OLW3IwKUV7t8e8XStJIoZidzDOMcqO569yuiWqY9WQSAZT6nz1pY7+1fpYJm -lismZ6vaBAVLriUr//k9S80gYsscKkbjqnLz6jFL7VCJgVSNC5LCVMJXpeJvnNz3 -UG1MIsNF/QbBf2dBgCr3f9Fqxpbr0tUHI8sg1PFZ4k5UE7gtJ60= -=N8ct ------END PGP SIGNATURE----- diff --git a/libreoffice-7.3.1.2.tar.xz b/libreoffice-7.3.1.2.tar.xz new file mode 100644 index 0000000..2520176 --- /dev/null +++ b/libreoffice-7.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e714cca429518b8b96f0baa1c73b57454d17406ef7002a96289384631a6d0b7 +size 255320720 diff --git a/libreoffice-7.3.1.2.tar.xz.asc b/libreoffice-7.3.1.2.tar.xz.asc new file mode 100644 index 0000000..4081616 --- /dev/null +++ b/libreoffice-7.3.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM0cACgkQ9DSh76/u +rqNjOhAAunod5m9XvO+aLDSOSFD9kMPQ2V+e+97mjMM1D94Tgih9dhjnHzhNtSjm +yZ1Pwp2mWzGn6DQkPtio/QjsJ1Ne0wD308ikUq8hhRMqloY8blYWRWVUFmbtJ7V5 +XVT03kpO1e0uVySW4xouhPkvdGLEHEGK9kmW+B/eYzjtTg0bn7x/0/WzvllaHXUE +smCYkkeFsKjvxPuXNJeOQJNknNNOG++XCux+TxMFufDUwrB7Z4g7J1+sge7bxTKq +8WceR1bv5uSnOcoaEW0RuuGQTbsqVo0I02BCOlC1/NqgV4+Wr4Y4/kkMgcvRmMTy +7ISKSX9y6/3ow1SGo+TVQziZ4wssl4av6NNclOyQn31oC7ojgQt5jTZLgqktYO/i +db8HANW+taQ15BcHTzN3zFbg9A7o33yC3COb2DHoo5OmJUQ40cj613UTW1x9+9/X +3L34QuNrWw3fE6RFH9/FVFow81qJ9jL1m7JLYguLoFtD+C4UuUwAhUk20Csd99/f +S3dBZZeqaLboOKfAaCRLPUcORKjaxL4SDE4x3nCMje8ai36ImoHp2bac16D+rIcy +6IjSsT0NxQCm+g7bFkorLJI6mJrgqqXKXeLmR3G/wJvVArtWeTWeWGhFPd8fs/k2 +Xv0+PqEkQU6pV82Ux9hXrOWIoJTy9zAFlUcojEQMnfxbAPeeELA= +=AvCq +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.3.1.1.tar.xz b/libreoffice-help-7.3.1.1.tar.xz deleted file mode 100644 index cde3382..0000000 --- a/libreoffice-help-7.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a67efaabaddd57377af18e0e86aedb397b27ca83b09263a6bdc3264f9a8cb302 -size 112208076 diff --git a/libreoffice-help-7.3.1.1.tar.xz.asc b/libreoffice-help-7.3.1.1.tar.xz.asc deleted file mode 100644 index 65a9491..0000000 --- a/libreoffice-help-7.3.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT5IACgkQ9DSh76/u -rqMjBQ/9HeJmIMCGcvoC0ql4kIge9hul3bwJtwfSzSX54Cz+SvVLtEiXGiA+Hs6X -A50mbGeQeuFByhNzxuw40bJz8gIE+Bu3I9MG0wTHLDCbO4/yzw0xnUz4DJIVTG+U -V2t+g9rewilWi55JUkfAGLeUA3SefbUSLKB2zwk9WXb2EMSabdO7+bb5hp+k0tP0 -R23I2hfc15OTtancSrNW5GRI1PI3IBk7RsFffKaqnRJqfKDBiYsT6OpdQYCzR+5p -4NqXTPcYxiWyRXdYl5KNdozln3GMJTirKE5kx3FPiTldEMc1JtFdngUY8UwMDfhb -XYykj0dtOY1UfLpv8GRJ0SbjemKcCTqIOSxmCudoDFkXub77RN2khPyF0ZuMB4ry -eD9N+lyfa4S4BCG+2oSR3DcNnMBGUfvZP+EG4kHLOcfjdCV38HKcgzkJ0HXTgPLx -CQmbvPKjpoc/d8M7uSd6G8YRh/SOB53zaGz0UU/aBh2gt1wGLJ1LXBxzEOtDdtkb -7lLbDDjefCD6brAkinPxK17UXgiEZIcItY7fFIQVGO391tWAJuLTJtEIsPIznkkm -PzGn+9w7qvq/PKZxhtcwCHDyEV6bVtdaVu/xekjXYiWmGCRj6ZCCuUjIKxEiD3ep -2PhWX0bERc0IVMsooD3ce+TkOBY+OsbG9Ztr40kaPPpJ0BBiSrs= -=lYoZ ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.3.1.2.tar.xz b/libreoffice-help-7.3.1.2.tar.xz new file mode 100644 index 0000000..0ffb6f8 --- /dev/null +++ b/libreoffice-help-7.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dbbaf47b3acc397a1fe9581cb6be50f61cde7cb21745a2a40661dfa3532a291 +size 112208144 diff --git a/libreoffice-help-7.3.1.2.tar.xz.asc b/libreoffice-help-7.3.1.2.tar.xz.asc new file mode 100644 index 0000000..f37e1d2 --- /dev/null +++ b/libreoffice-help-7.3.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1kACgkQ9DSh76/u +rqN8zQ//fB8F8F7czxrxoBj8D/q/G01hCDXftfPOz+x16bHy7CMphlfD0NprW0ia +YWTp12vu6LM4GJr+1a4IaBAiCXueYcVqY28MPXx4zGPvRoR4HKcNJpQgcAQEvDii +j5d8heZxHvjWWtdzi1pSnRxkYoP+/lHWyMf9lzgC9M6s5i3MbQY776diJ0mBIcMc +EckX+Xkx5rtM89mO4YkfSJJ2CbVi1JnHNiUNuNQDYyS5SyPvxPveOrJQF4b9k399 +b0NSCUOeMZsRguL7rpTjtdUGXGfJENEFufYOTcFk2lQgBKm2qN7WvVdkojU8aUi4 +0H/Qjo2rzqCNqEnknAuuF8CKoRMRIHM4dPdnlh9NwR4sO7vnc7SSA/A5qcGG2KrX +/k09a20yEeFhPFqOMogdKuPLDqlZ9y49VZfPsbae8XNUWt24XnU+Eq3WU75J/3kN +mx6kDmE+NiWXKqLXjM/rhxZSI1IwuXEOhX/ckGGOE29Tn18WSB1hSjMqEnnOiWHQ +WnDL1KjtNLjBNCaPD3gcfDhyHPiwAjRmcIlNoLzJe6o+0CPmvdM35/2FfT5Cx/0M +ZUVgrDTYXKGoJuP25GJdVqetd9YqxumuSpuJ2/+Qfr+Ufxl7RY0qKLVLWX9+ioaW +qjeZmEMwAhdClrthAMYWgTZ3yXvgzS6jGJvY6nC45WoCt00lp/E= +=qtdu +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.3.1.1.tar.xz b/libreoffice-translations-7.3.1.1.tar.xz deleted file mode 100644 index b566237..0000000 --- a/libreoffice-translations-7.3.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b0a10b73eb0e7e3781eae61d18edf8d9f279700d86ccc0963e6dffff09668ae -size 196019764 diff --git a/libreoffice-translations-7.3.1.1.tar.xz.asc b/libreoffice-translations-7.3.1.1.tar.xz.asc deleted file mode 100644 index d758f2e..0000000 --- a/libreoffice-translations-7.3.1.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIGT5QACgkQ9DSh76/u -rqPG/g//dkKs6bhQlEQ8T7pU7xN+vif99akisTOJ3qlCuo0ky+lOw8M3lFzMKxnH -/ZbwgOCpO3vLt5mCzhv0TGpXVHCaiFF14aYIV8wFK2UPqvsUTgPf5V6PwncIn7/z -uw1m0NGEdjtNlIjlm6O/5DCaPSOWPn/dbe4I+aiMSNfOhf9KunViRf/kKjkreUQY -Rt0OFiAAqm5f64SloO0q/Ecmr8zbav8I57e/9LoiqPb+pC/GdjWgQpRxUwXXabLy -m8MbiNknnIXNZaFogrN3KDJ3+Sf+1dSpFPAOwfUi+5FNhZJvIYOyl+Kx0led+tXk -CS6E+LnzAyzsUMqaF8fImj+r4A7Q+nsCCiG/G5hsyFNgufyhVP3I8eQ83tq6z1DM -DtZUnOsh0Yi/hqTcUDKbgHLimo79c+38BqDl+Ed+OL0FUWWCxFLEvWazrkYcjAqQ -+SPdPEaHfIfks3D7NbztJpCbQx2ig0i/8KXIt1qSh5BvoejpyUwqlhFtCfDuGqAW -CswCKWTWp/yseRz2DfD2ibOw76FM9oxmg79nnBZqtG4ojFB1tvwJltGd5NzAKrsk -pgmpRHvD1Kq9hbAOIBtW+39gNwtHvklbbzx3EjkAflM1SsKDQepymGP/GHdNKxTq -81tmszm/ZFGGuLj4LrklzygfjcqxTb3xrSVnBAlqf89Gym80UkI= -=zr9T ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.3.1.2.tar.xz b/libreoffice-translations-7.3.1.2.tar.xz new file mode 100644 index 0000000..dd1c026 --- /dev/null +++ b/libreoffice-translations-7.3.1.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb0917dd7e33b30464b992bf31b1e4ccd59b73920349c2a03a196dbf3cf284f3 +size 196055264 diff --git a/libreoffice-translations-7.3.1.2.tar.xz.asc b/libreoffice-translations-7.3.1.2.tar.xz.asc new file mode 100644 index 0000000..cdc3e06 --- /dev/null +++ b/libreoffice-translations-7.3.1.2.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1oACgkQ9DSh76/u +rqMz6g//ZLVdlCfgYlM7bH87eOEFnTq6KvtM9zsKvJfv2i9siI2FD7tSwMgeAzBr +v2QVmYgFfd7TTcw8+ZYqRuhkUVHs8Uz3eM1dPtJPN9uRvPPITAcdYRhGfu5Zaejt +3Ivnd+nyDLeYXa87oaPddbAdHPshxlyA7gBvuo+7piqvK75KQHoVJiuim2JMmjfe +XAsKYQwOZw8wKEWTvXY5ZN+nbxeGL0XWEpS1EIJB09E9Dw6EGNTmPOcaShBg+zTW +dgfSf6j+RzTyU77FaRjOeo0hrHM3frhmLQRqKgDA+okyzNxsrdKpxsddYq6RRPvq +KlW+kN9tredoXvH/9t7VmxlI9ShSYiCzHoYT4gjRehecsLRIubBcCOEgK3ISisNa +vRZDUrr/44+Og6KXo+Ji1a0QvN++DTWJ8VineVO200TzBECUOCXgEnhmcp79crXF +pFhXvXmyZFCDTgK5u8nJhNTTSUagkZXZlfEM14lf5zRFzKFy0h5WPjpiGs6V3t9L +/jPPEuX0OhmxIbXENaylRQXNCL1QqBF8EO6OKTA8lJ1EGCbFLJayMiVQ5bRc/S9u +iq5aYxFhd3b7lHZ0a71uMvmsmOwrrXcQabAVA7a90O+yPF8w52HWtzAXt5OygxCN +dB2D06iD6mtcvr3g1kU+N/0VDbs3QCYxYDa7do1L/wkd2uTkMQg= +=05hN +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 171e7fa..d2ac035 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella + +- Update to 7.3.1.2 +- Remove upstreamed patch: + * 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch + ------------------------------------------------------------------- Thu Feb 17 10:10:53 UTC 2022 - Christophe Giboudeaux diff --git a/libreoffice.spec b/libreoffice.spec index 6ca244f..5bcf4e1 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -34,7 +34,9 @@ %else %bcond_with kdeintegration %endif -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +# Use bundled gpgme on SLE-15-SP3 onwards +# Use system gpgme on TW and SLE15-SP4 or newer +%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 %bcond_without system_gpgme %else # Hack in the bundled libs to not pop up on requires/provides to avoid @@ -46,7 +48,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.3.1.1 +Version: 7.3.1.2 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -104,8 +106,6 @@ Patch3: mediawiki-no-broken-help.diff Patch6: gcc11-fix-error.patch Patch9: fix_math_desktop_file.patch Patch10: fix_gtk_popover_on_3.20.patch -# PATCH-FIX-UPSTREAM boo#1196017 Fix KDE Frameworks 5.91 detection -Patch11: 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -137,6 +137,7 @@ BuildRequires: gperf >= 3.1 BuildRequires: graphviz BuildRequires: hyphen-devel BuildRequires: junit4 +BuildRequires: libassuan0 BuildRequires: libbase BuildRequires: libcppunit-devel >= 1.14.0 BuildRequires: libcuckoo-devel @@ -1008,7 +1009,6 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %patch3 %patch6 -p1 %patch9 -p1 -%patch11 -p1 %if 0%{?suse_version} < 1500 %patch10 -p1 %patch101 -p1 From a1b41309dbead3676d00dea2e8a54e2db43a373fcc3c42d2a9b10e8fffd21b21 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Mon, 7 Mar 2022 09:35:12 +0000 Subject: [PATCH 2/3] Accepting request 959715 from home:iznogood:factory Fix build with poppler 22.03.0. Staging M please when forwarded to Factory OBS-URL: https://build.opensuse.org/request/show/959715 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=994 --- libreoffice.changes | 6 ++++++ libreoffice.spec | 3 +++ poppler-22-03-0.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 poppler-22-03-0.patch diff --git a/libreoffice.changes b/libreoffice.changes index d2ac035..1be4493 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie + +- Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch + lifted from arch linux. + ------------------------------------------------------------------- Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index 5bcf4e1..b1f231a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -112,6 +112,8 @@ Patch101: 0001-Revert-java-9-changes.patch Patch990: install-with-hardlinks.diff # save time by relying on rpm check rather than doing stupid find+grep Patch991: libreoffice-no-destdircheck.patch +# PATCH-FIX-UPSTRAM poppler-22-03-0.patch +Patch992: poppler-22-03-0.patch BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -1015,6 +1017,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %endif %patch990 -p1 %patch991 -p1 +%patch992 -p1 # Disable some of the failing tests (some are random) %if 0%{?suse_version} < 1330 diff --git a/poppler-22-03-0.patch b/poppler-22-03-0.patch new file mode 100644 index 0000000..64f8c54 --- /dev/null +++ b/poppler-22-03-0.patch @@ -0,0 +1,29 @@ +diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +index ad6320139..e5f6d9c68 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -138,6 +138,15 @@ int main(int argc, char **argv) + _setmode( _fileno( g_binary_out ), _O_BINARY ); + #endif + ++#if POPPLER_CHECK_VERSION(22, 3, 0) ++ PDFDoc aDoc( std::make_unique(pFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++ ++ PDFDoc aErrDoc( std::make_unique(pErrFileName), ++ GooString(pOwnerPasswordStr), ++ GooString(pUserPasswordStr) ); ++#else + PDFDoc aDoc( pFileName, + pOwnerPasswordStr, + pUserPasswordStr ); +@@ -145,6 +154,7 @@ int main(int argc, char **argv) + PDFDoc aErrDoc( pErrFileName, + pOwnerPasswordStr, + pUserPasswordStr ); ++#endif + + // Check various permissions for aDoc. + PDFDoc &rDoc = aDoc.isOk()? aDoc: aErrDoc; + From 85f0edc7fe3ee1ca4b8315edec4f08b6be0c0b238d6bb5a2e2d3a0667fca45dc Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Mon, 7 Mar 2022 09:38:59 +0000 Subject: [PATCH 3/3] Accepting request 959813 from LibreOffice:7.3 - Update to 7.3.1.3 OBS-URL: https://build.opensuse.org/request/show/959813 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=995 --- ...ate-kf5-include-lib-check-to-work-wi.patch | 57 ------------------- curl-7.79.1.tar.xz | 3 + libreoffice-7.3.1.2.tar.xz | 3 - libreoffice-7.3.1.2.tar.xz.asc | 16 ------ libreoffice-7.3.1.3.tar.xz | 3 + libreoffice-7.3.1.3.tar.xz.asc | 16 ++++++ libreoffice-help-7.3.1.2.tar.xz | 3 - libreoffice-help-7.3.1.2.tar.xz.asc | 16 ------ libreoffice-help-7.3.1.3.tar.xz | 3 + libreoffice-help-7.3.1.3.tar.xz.asc | 16 ++++++ libreoffice-translations-7.3.1.2.tar.xz | 3 - libreoffice-translations-7.3.1.2.tar.xz.asc | 16 ------ libreoffice-translations-7.3.1.3.tar.xz | 3 + libreoffice-translations-7.3.1.3.tar.xz.asc | 16 ++++++ libreoffice.changes | 5 ++ libreoffice.spec | 7 ++- 16 files changed, 71 insertions(+), 115 deletions(-) delete mode 100644 0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch create mode 100644 curl-7.79.1.tar.xz delete mode 100644 libreoffice-7.3.1.2.tar.xz delete mode 100644 libreoffice-7.3.1.2.tar.xz.asc create mode 100644 libreoffice-7.3.1.3.tar.xz create mode 100644 libreoffice-7.3.1.3.tar.xz.asc delete mode 100644 libreoffice-help-7.3.1.2.tar.xz delete mode 100644 libreoffice-help-7.3.1.2.tar.xz.asc create mode 100644 libreoffice-help-7.3.1.3.tar.xz create mode 100644 libreoffice-help-7.3.1.3.tar.xz.asc delete mode 100644 libreoffice-translations-7.3.1.2.tar.xz delete mode 100644 libreoffice-translations-7.3.1.2.tar.xz.asc create mode 100644 libreoffice-translations-7.3.1.3.tar.xz create mode 100644 libreoffice-translations-7.3.1.3.tar.xz.asc diff --git a/0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch b/0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch deleted file mode 100644 index 7811e48..0000000 --- a/0001-configure.ac-Update-kf5-include-lib-check-to-work-wi.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5fd5e42bf28a7910321c6b6d76257e7386839fbc Mon Sep 17 00:00:00 2001 -From: Michael Weghorn -Date: Wed, 16 Feb 2022 13:38:47 +0100 -Subject: [PATCH] configure.ac: Update kf5 include/lib check to work with KF5 - >= 5.91 - -The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons' -subdirectory in kcoreaddons commit - - commit d971ba9bb27a3e8f18a116692fdf98c1729ac244 - Author: Ahmad Samir - Date: Sat Jan 15 14:14:13 2022 +0200 - - Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/ - - Instead of /usr/include/KF5/kcoreaddons_version.h. - - For more details see: - https://invent.kde.org/frameworks/kservice/-/merge_requests/79 - - GIT_SILENT - -Adapt the KF5 check to check for the 'KFileWidget' header and -the 'libKF5KIOFileWidgets.so' library instead. -This is more exact anyway, since we require KIOFileWidgets, -and the previous check didn't ensure that. -(So in case only KF5CoreAddons but not KIOFileWidgets was installed, -configure would previously pass, but the build fail.) - -[1] https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244 - -Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996 -Tested-by: Jenkins -Reviewed-by: Michael Weghorn ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6acb3107cea3..4e84f9a33980 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13017,8 +13017,8 @@ then - kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" - fi - -- kf5_test_include="KF5/kcoreaddons_version.h" -- kf5_test_library="libKF5CoreAddons.so" -+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget" -+ kf5_test_library="libKF5KIOFileWidgets.so" - kf5_libdirs="$qt5_libdir $kf5_libdirs" - - dnl kf5 KDE4 support compatibility installed --- -2.35.1 - diff --git a/curl-7.79.1.tar.xz b/curl-7.79.1.tar.xz new file mode 100644 index 0000000..48318b8 --- /dev/null +++ b/curl-7.79.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0606f74b1182ab732a17c11613cbbaf7084f2e6cca432642d0e3ad7c224c3689 +size 2465212 diff --git a/libreoffice-7.3.1.2.tar.xz b/libreoffice-7.3.1.2.tar.xz deleted file mode 100644 index 2520176..0000000 --- a/libreoffice-7.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e714cca429518b8b96f0baa1c73b57454d17406ef7002a96289384631a6d0b7 -size 255320720 diff --git a/libreoffice-7.3.1.2.tar.xz.asc b/libreoffice-7.3.1.2.tar.xz.asc deleted file mode 100644 index 4081616..0000000 --- a/libreoffice-7.3.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM0cACgkQ9DSh76/u -rqNjOhAAunod5m9XvO+aLDSOSFD9kMPQ2V+e+97mjMM1D94Tgih9dhjnHzhNtSjm -yZ1Pwp2mWzGn6DQkPtio/QjsJ1Ne0wD308ikUq8hhRMqloY8blYWRWVUFmbtJ7V5 -XVT03kpO1e0uVySW4xouhPkvdGLEHEGK9kmW+B/eYzjtTg0bn7x/0/WzvllaHXUE -smCYkkeFsKjvxPuXNJeOQJNknNNOG++XCux+TxMFufDUwrB7Z4g7J1+sge7bxTKq -8WceR1bv5uSnOcoaEW0RuuGQTbsqVo0I02BCOlC1/NqgV4+Wr4Y4/kkMgcvRmMTy -7ISKSX9y6/3ow1SGo+TVQziZ4wssl4av6NNclOyQn31oC7ojgQt5jTZLgqktYO/i -db8HANW+taQ15BcHTzN3zFbg9A7o33yC3COb2DHoo5OmJUQ40cj613UTW1x9+9/X -3L34QuNrWw3fE6RFH9/FVFow81qJ9jL1m7JLYguLoFtD+C4UuUwAhUk20Csd99/f -S3dBZZeqaLboOKfAaCRLPUcORKjaxL4SDE4x3nCMje8ai36ImoHp2bac16D+rIcy -6IjSsT0NxQCm+g7bFkorLJI6mJrgqqXKXeLmR3G/wJvVArtWeTWeWGhFPd8fs/k2 -Xv0+PqEkQU6pV82Ux9hXrOWIoJTy9zAFlUcojEQMnfxbAPeeELA= -=AvCq ------END PGP SIGNATURE----- diff --git a/libreoffice-7.3.1.3.tar.xz b/libreoffice-7.3.1.3.tar.xz new file mode 100644 index 0000000..4bef3a9 --- /dev/null +++ b/libreoffice-7.3.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b57f6822a8571a8bd984b4dc048f519c2143c769714dbd491f60b8cc71f51a2 +size 255329180 diff --git a/libreoffice-7.3.1.3.tar.xz.asc b/libreoffice-7.3.1.3.tar.xz.asc new file mode 100644 index 0000000..672531b --- /dev/null +++ b/libreoffice-7.3.1.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKXsACgkQ9DSh76/u +rqNgew//X6FANTeNXlwrCe8HMVg2n9O2JR5mVBhNNUnHB1SyLBOTe2mSoWA6eQth +cpNWSUeXgKZZcWpEbH8sM4kZ+msP5MbbgRpoJADYHClegsFyBuLQvkDCa67TxIDI +Qa61DO2fb5+HDTzfjmKEaOEUI4eoIag7ItjHfc/sl/k+fg69KosdXrv8POtWeg+e +D7/0DK3GgSvaNnwfLLCPGiow7FPfud5xYDgLhHuILtn5EEyZFc8nscWtqTqV/mTz +vuZyCyKUe73OxjaolfHZnVaIjMdLbedhje8xoPdg3GsM7AFb2xS/F2exH9kQlvmB +nM2uOKulfpRGc3QUr7fsJfdeGpfzZxg+TT/SHgibyI086UHzIuRhTBqBUPToOnMs +kXIKuXYd6srXMZ8rcW+LWhjU3mZbzTyRS54pUbW09z+p2uYLpSTfgkNZKyu9whoZ +K7j6kCo67xKT4O04JD0bDotncasKcTggnTm0FqoHeXxeJR0XSHhZhQAxGD4D8QD7 +jpVEGz4KREYidLR1AfpqVm3mgSrbMwXnb0lidOKPVgJMHI1xENZJSbBiZGkWjm7t +UY9JsfJcA6Irc39jHTjgVAWoy2FxXi2lhTNB/NSGmHH7Q+ZyuB4WnBjZKUqw8m0x +wEBPK/1iKtJxmLpaDdtjqSXI5IDqUcoGQDyD2LPjhFvLR+7zSVo= +=RfmA +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.3.1.2.tar.xz b/libreoffice-help-7.3.1.2.tar.xz deleted file mode 100644 index 0ffb6f8..0000000 --- a/libreoffice-help-7.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dbbaf47b3acc397a1fe9581cb6be50f61cde7cb21745a2a40661dfa3532a291 -size 112208144 diff --git a/libreoffice-help-7.3.1.2.tar.xz.asc b/libreoffice-help-7.3.1.2.tar.xz.asc deleted file mode 100644 index f37e1d2..0000000 --- a/libreoffice-help-7.3.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1kACgkQ9DSh76/u -rqN8zQ//fB8F8F7czxrxoBj8D/q/G01hCDXftfPOz+x16bHy7CMphlfD0NprW0ia -YWTp12vu6LM4GJr+1a4IaBAiCXueYcVqY28MPXx4zGPvRoR4HKcNJpQgcAQEvDii -j5d8heZxHvjWWtdzi1pSnRxkYoP+/lHWyMf9lzgC9M6s5i3MbQY776diJ0mBIcMc -EckX+Xkx5rtM89mO4YkfSJJ2CbVi1JnHNiUNuNQDYyS5SyPvxPveOrJQF4b9k399 -b0NSCUOeMZsRguL7rpTjtdUGXGfJENEFufYOTcFk2lQgBKm2qN7WvVdkojU8aUi4 -0H/Qjo2rzqCNqEnknAuuF8CKoRMRIHM4dPdnlh9NwR4sO7vnc7SSA/A5qcGG2KrX -/k09a20yEeFhPFqOMogdKuPLDqlZ9y49VZfPsbae8XNUWt24XnU+Eq3WU75J/3kN -mx6kDmE+NiWXKqLXjM/rhxZSI1IwuXEOhX/ckGGOE29Tn18WSB1hSjMqEnnOiWHQ -WnDL1KjtNLjBNCaPD3gcfDhyHPiwAjRmcIlNoLzJe6o+0CPmvdM35/2FfT5Cx/0M -ZUVgrDTYXKGoJuP25GJdVqetd9YqxumuSpuJ2/+Qfr+Ufxl7RY0qKLVLWX9+ioaW -qjeZmEMwAhdClrthAMYWgTZ3yXvgzS6jGJvY6nC45WoCt00lp/E= -=qtdu ------END PGP SIGNATURE----- diff --git a/libreoffice-help-7.3.1.3.tar.xz b/libreoffice-help-7.3.1.3.tar.xz new file mode 100644 index 0000000..e5a12dd --- /dev/null +++ b/libreoffice-help-7.3.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34fb4c3f5ba76deefe409d14c027899a1014fd8ffff057238ba37c1dd17baaaa +size 112208156 diff --git a/libreoffice-help-7.3.1.3.tar.xz.asc b/libreoffice-help-7.3.1.3.tar.xz.asc new file mode 100644 index 0000000..9a3bdef --- /dev/null +++ b/libreoffice-help-7.3.1.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYIACgkQ9DSh76/u +rqPtRw/9Greh3cXfOt8fAM38kCDKcZTc3rU2IncrLbBzkwxGm6PnKgXPIEkg4794 +ljk169/7tHB6M70s2V5XGiG2gtlLJLRNod/lXHkftDez6NAKKYuoGDeTjgzhRjX/ +K5N7fCARbX4JK8wu910BTjwmCGvo7Gc6k1+sD4HfRBm+CeXMj31uQ4Oh5K0nLm51 +xdqNdVfKdnQuA2io+kHe2uuSPuy2a2vKvf5NcFjKK2T+Nr5RJuJV0ajS09sC3sGG +w0yuZY5+jUk2HNNJeRHHO4VnKx7GCYzmwzyajFR3b1LYkzg0sWefMVgWjEREbRZ9 +6p0Y4KRmsGZjWAoYkQAi90wsoWQbXCKiXmDNJyw7BEDQyKDdxTZ/JnJLwkfeJV2B +wniuBxCA36Azr4wdRgGMP9FuBurEaB1+KxUhmmCFUMrx7N/ZgSZ0AKwjdkIhLz9d +NHdbsqP0Mu931uXTLasXcq2NqqVFglHFgkrLrnj+dW9NOprUFbf1mrjr65toTwnr +unt4FxSTBuC4FErwGsNlSwNDZMDhNbpNaHHq3jqIj6HODiZ0NcyAOSxVisgyo4bS +uwvkz6OoLFW77nL9j2fJR7DOfLjA8OxvYZv65DMSuDWG8GVNCl0n6AyMaPO27gbK +kRfzr3e4ELGUv2q4NnOOpofJC3puZRp7ZE3p8MNKPsm4+rVW6Ak= +=ZucG +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.3.1.2.tar.xz b/libreoffice-translations-7.3.1.2.tar.xz deleted file mode 100644 index dd1c026..0000000 --- a/libreoffice-translations-7.3.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb0917dd7e33b30464b992bf31b1e4ccd59b73920349c2a03a196dbf3cf284f3 -size 196055264 diff --git a/libreoffice-translations-7.3.1.2.tar.xz.asc b/libreoffice-translations-7.3.1.2.tar.xz.asc deleted file mode 100644 index cdc3e06..0000000 --- a/libreoffice-translations-7.3.1.2.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIWM1oACgkQ9DSh76/u -rqMz6g//ZLVdlCfgYlM7bH87eOEFnTq6KvtM9zsKvJfv2i9siI2FD7tSwMgeAzBr -v2QVmYgFfd7TTcw8+ZYqRuhkUVHs8Uz3eM1dPtJPN9uRvPPITAcdYRhGfu5Zaejt -3Ivnd+nyDLeYXa87oaPddbAdHPshxlyA7gBvuo+7piqvK75KQHoVJiuim2JMmjfe -XAsKYQwOZw8wKEWTvXY5ZN+nbxeGL0XWEpS1EIJB09E9Dw6EGNTmPOcaShBg+zTW -dgfSf6j+RzTyU77FaRjOeo0hrHM3frhmLQRqKgDA+okyzNxsrdKpxsddYq6RRPvq -KlW+kN9tredoXvH/9t7VmxlI9ShSYiCzHoYT4gjRehecsLRIubBcCOEgK3ISisNa -vRZDUrr/44+Og6KXo+Ji1a0QvN++DTWJ8VineVO200TzBECUOCXgEnhmcp79crXF -pFhXvXmyZFCDTgK5u8nJhNTTSUagkZXZlfEM14lf5zRFzKFy0h5WPjpiGs6V3t9L -/jPPEuX0OhmxIbXENaylRQXNCL1QqBF8EO6OKTA8lJ1EGCbFLJayMiVQ5bRc/S9u -iq5aYxFhd3b7lHZ0a71uMvmsmOwrrXcQabAVA7a90O+yPF8w52HWtzAXt5OygxCN -dB2D06iD6mtcvr3g1kU+N/0VDbs3QCYxYDa7do1L/wkd2uTkMQg= -=05hN ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.3.1.3.tar.xz b/libreoffice-translations-7.3.1.3.tar.xz new file mode 100644 index 0000000..2317bc3 --- /dev/null +++ b/libreoffice-translations-7.3.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9b4b8ccf89ba92ad031ab909cd1dc2419aa83948ed7bf4694215a247535124e +size 196069996 diff --git a/libreoffice-translations-7.3.1.3.tar.xz.asc b/libreoffice-translations-7.3.1.3.tar.xz.asc new file mode 100644 index 0000000..3c0798e --- /dev/null +++ b/libreoffice-translations-7.3.1.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmIdKYMACgkQ9DSh76/u +rqMmpg//QaFMyF2Okhsju/aE2RT4ngn8s4Ngydl10Cv7MIElCAGEEfvU3zAZRoX0 +JoRU8WAIIWKyEDsWN/TQwZ4CaQ+1Hff7UVFgn9WOOnChtKs4G0mGhrr1gV6ExOXG +jw8xtJTWE/WIBYlwWkKw6Nq/n4RBgALI4Wh5Ba+jFW8lK2mJDre/ic3xRLeKvdZv +HgZ2DYY0zYKUWyaUCQfKdyniPxLW7bNVWDZ3BhXQ0XDTDthai18ovkRwNXAEGTNf +14OXA5jb/fAenbPewtciw8T8wvSxuQFaOHLrg9Yg8hrWZgaIjIcKG2NIJoB9udU0 +jiEEFoko596QBXOff7yad10PKI7fp+3ReL50u5ZCqYn8ETnktP1wZfs1dw7X4Q6H +LUwJ7tLrcDoov62jgKICelAzhVcfPIdaPE/gN4vyz2h5MSk5kh2tI7+JzNKaB9s8 +CJ7uOH07V6TjeX6XOygWq9aPHEyxX/OCIuHZJznL3JDVOCgYY4nK5s14l1SBXupW +qXA+qMTPXMjfFRGGT1UcDTGgMmmDNvErN2yys53EjAvIMcTMaWLObixJn7Zutjzl +Aoaq+4Mdy/d9yMoFwxkqiKn25HT6DiU5MAz5PKlVfgu5YXt1CSi9TU9OZe9RJkGk +wsNJ5jrju4vBjQmAT68vV+VMP2/jX9B3I/Otdt23CIU4KjPTxBU= +=vKrk +-----END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index 1be4493..5ae3899 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -4,6 +4,11 @@ Sat Mar 5 14:30:08 UTC 2022 - Bjørn Lie - Add poppler-22-03-0.patch: Fix build with poppler 22.03.0. Patch lifted from arch linux. +------------------------------------------------------------------- +Fri Mar 4 09:49:17 UTC 2022 - Danilo Spinella + +- Update to 7.3.1.3 + ------------------------------------------------------------------- Mon Feb 28 16:46:05 UTC 2022 - Danilo Spinella diff --git a/libreoffice.spec b/libreoffice.spec index b1f231a..b1edf02 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -48,7 +48,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.3.1.2 +Version: 7.3.1.3 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -95,6 +95,7 @@ Source2009: %{external_url}/dtoa-20180411.tgz # Skia is part of chromium and bundled everywhere as by google only way is monorepo way Source2010: %{external_url}/skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz Source2012: %{external_url}/libcmis-0.5.2.tar.xz +Source2013: %{external_url}/curl-7.79.1.tar.xz # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build Patch1: scp2-user-config-suse.diff @@ -123,7 +124,10 @@ BuildRequires: bison BuildRequires: bsh2 BuildRequires: commons-logging BuildRequires: cups-devel +# Use bundled curl on SLE-12-SP5 +%if 0%{suse_version} >= 1500 BuildRequires: curl-devel >= 7.68.0 +%endif # Needed for tests BuildRequires: dejavu-fonts BuildRequires: doxygen >= 1.8.4 @@ -1164,6 +1168,7 @@ export NOCONFIGURE=yes %endif %if 0%{?suse_version} < 1500 --without-system-icu \ + --without-system-curl \ %endif --enable-evolution2 \ --enable-dbus \