From c3ed34411a6884a989dd13948a4eecb27b67a6cf0168ad18577f353e57d007ac Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 28 Feb 2024 10:12:53 +0000 Subject: [PATCH] Accepting request 1152889 from LibreOffice:24.2 - Update to 24.2.0.3 (24.2.0 final): https://wiki.documentfoundation.org/ReleaseNotes/24.2 - Armenian translation added - Update patch handling to be compatible with rpm 4.20 OBS-URL: https://build.opensuse.org/request/show/1152889 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1134 --- Java-WebSocket-1.5.4.tar.gz | 3 + curl-8.4.0.tar.xz | 3 - curl-8.5.0.tar.xz | 3 + gpgme-1.18.0.tar.bz2 | 3 - gpgme-1.20.0.tar.bz2 | 3 + libgpg-error-1.43.tar.bz2 | 3 - libgpg-error-1.47.tar.bz2 | 3 + libreoffice-24.2.0.3.tar.xz | 3 + libreoffice-24.2.0.3.tar.xz.asc | 16 ++++ libreoffice-7.6.4.1.tar.xz | 3 - libreoffice-7.6.4.1.tar.xz.asc | 16 ---- libreoffice-help-24.2.0.3.tar.xz | 3 + libreoffice-help-24.2.0.3.tar.xz.asc | 16 ++++ libreoffice-help-7.6.4.1.tar.xz | 3 - libreoffice-help-7.6.4.1.tar.xz.asc | 16 ---- libreoffice-translations-24.2.0.3.tar.xz | 3 + libreoffice-translations-24.2.0.3.tar.xz.asc | 16 ++++ libreoffice-translations-7.6.4.1.tar.xz | 3 - libreoffice-translations-7.6.4.1.tar.xz.asc | 16 ---- libreoffice.changes | 8 ++ libreoffice.spec | 84 +++++++++---------- pdfium-5778.tar.bz2 | 3 - pdfium-6179.tar.bz2 | 3 + ...97fb3dcbc96b2b40999751611d029bf5404.tar.xz | 3 - ...183eb260f63698aa74d1bb380f247ad7ccd.tar.xz | 3 + 25 files changed, 121 insertions(+), 118 deletions(-) create mode 100644 Java-WebSocket-1.5.4.tar.gz delete mode 100644 curl-8.4.0.tar.xz create mode 100644 curl-8.5.0.tar.xz delete mode 100644 gpgme-1.18.0.tar.bz2 create mode 100644 gpgme-1.20.0.tar.bz2 delete mode 100644 libgpg-error-1.43.tar.bz2 create mode 100644 libgpg-error-1.47.tar.bz2 create mode 100644 libreoffice-24.2.0.3.tar.xz create mode 100644 libreoffice-24.2.0.3.tar.xz.asc delete mode 100644 libreoffice-7.6.4.1.tar.xz delete mode 100644 libreoffice-7.6.4.1.tar.xz.asc create mode 100644 libreoffice-help-24.2.0.3.tar.xz create mode 100644 libreoffice-help-24.2.0.3.tar.xz.asc delete mode 100644 libreoffice-help-7.6.4.1.tar.xz delete mode 100644 libreoffice-help-7.6.4.1.tar.xz.asc create mode 100644 libreoffice-translations-24.2.0.3.tar.xz create mode 100644 libreoffice-translations-24.2.0.3.tar.xz.asc delete mode 100644 libreoffice-translations-7.6.4.1.tar.xz delete mode 100644 libreoffice-translations-7.6.4.1.tar.xz.asc delete mode 100644 pdfium-5778.tar.bz2 create mode 100644 pdfium-6179.tar.bz2 delete mode 100644 skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz create mode 100644 skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz diff --git a/Java-WebSocket-1.5.4.tar.gz b/Java-WebSocket-1.5.4.tar.gz new file mode 100644 index 0000000..2d5f3c0 --- /dev/null +++ b/Java-WebSocket-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6828b35d1f938fee2335945f3d3c563cbbfa58ce7eb0bf72778d0fa7a550720 +size 189725 diff --git a/curl-8.4.0.tar.xz b/curl-8.4.0.tar.xz deleted file mode 100644 index 55f76a5..0000000 --- a/curl-8.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d -size 2658376 diff --git a/curl-8.5.0.tar.xz b/curl-8.5.0.tar.xz new file mode 100644 index 0000000..497c78e --- /dev/null +++ b/curl-8.5.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb +size 2658520 diff --git a/gpgme-1.18.0.tar.bz2 b/gpgme-1.18.0.tar.bz2 deleted file mode 100644 index 59e7f40..0000000 --- a/gpgme-1.18.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e -size 1762323 diff --git a/gpgme-1.20.0.tar.bz2 b/gpgme-1.20.0.tar.bz2 new file mode 100644 index 0000000..e54e7a1 --- /dev/null +++ b/gpgme-1.20.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 +size 1817377 diff --git a/libgpg-error-1.43.tar.bz2 b/libgpg-error-1.43.tar.bz2 deleted file mode 100644 index 24a416a..0000000 --- a/libgpg-error-1.43.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf -size 999006 diff --git a/libgpg-error-1.47.tar.bz2 b/libgpg-error-1.47.tar.bz2 new file mode 100644 index 0000000..d5d2be2 --- /dev/null +++ b/libgpg-error-1.47.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb +size 1020862 diff --git a/libreoffice-24.2.0.3.tar.xz b/libreoffice-24.2.0.3.tar.xz new file mode 100644 index 0000000..2b9979e --- /dev/null +++ b/libreoffice-24.2.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f456917aa207f3bf4f4c013c392261a7d374075fb2fe246a2cfe58b3483568 +size 280356652 diff --git a/libreoffice-24.2.0.3.tar.xz.asc b/libreoffice-24.2.0.3.tar.xz.asc new file mode 100644 index 0000000..719c41d --- /dev/null +++ b/libreoffice-24.2.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWzlYYACgkQ9DSh76/u +rqOhUxAArpKMX+OZKiT16+0z/wz6/VLma/Oqa8EXZxVrP/8OEVy1kpFEqy6JDGyL +ABILb7SAytndDojAS0IeCzOAZj/F954p0GV8VlOt5I6dzmFxuRgLodhg3t5lfkXD +xpNQFVyVEInoxMTvzJe44V8CRpUcO1kCr27IUL90Tm8zdr6MPu2DYm3o3ceaARtX +z9VPgXwBIzzbmprFIh1STRR8Pi8I3j4f+sdRdiZwn4tmQ+Nf3rOg4hv95QYGmmL8 +88KM2beT76dnomDB0p2zs4B5/Gh3b2gt4gFl7yJYgVYh8hzX4fIVq/hUoMhoOb5m +7lcPd/Gde9vK7/nuO/bY3TQaG1ordck7lI3BZXrRnRdUHXjgkZ9Z3AsEaCz/bGQM +BPim4NnjdSnpo5icNpppxE99dv8pzxQhLLqmkgJbbANBZwqNr5g6sWV82wIXTTNk +jOtMmsrxdE/+z5uiwIvlUEUeaH/iRfv2mSXTn3mr2wcMG5VAjuCXHGEMXeDL2OsZ +0LSqHFBMmYq4X1cS+FlC1oxzlQEqO6X0zkPPvS1q7TaDF+tlFfX58psBKeHgFdX2 +hJFT6UW8eFhN08TljWrlLJ8ny3/lERgM3eWUpJIFzqYod1GdiUf2D3iOAD5RjtgI +/jG4DF9ilSfeHEr6jQdfaifVmjDrWePrH8Q9aDDFfCvG0v6D+8s= +=qSuY +-----END PGP SIGNATURE----- diff --git a/libreoffice-7.6.4.1.tar.xz b/libreoffice-7.6.4.1.tar.xz deleted file mode 100644 index 8d44a87..0000000 --- a/libreoffice-7.6.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13fea7b8f24c776313b9e08628aa590390bea45064be73bc70ee7b1b70aa6a1e -size 281547116 diff --git a/libreoffice-7.6.4.1.tar.xz.asc b/libreoffice-7.6.4.1.tar.xz.asc deleted file mode 100644 index 9218398..0000000 --- a/libreoffice-7.6.4.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVomxUACgkQ9DSh76/u -rqPeVxAAhtYVR8AaIVecGLIC/NXJVWoXUOSiGOWRuEa6HrRYlDrTIJNbYcEqq2nj -MXTDYbgXv4bJ5jiHvZc896wGnxxZxv74TuWBmKZBAppOu3afJ9QPMw3oJw3wtgec -XI+pGZglhxMRxhi8dPDZy3kK0AIv0LXnEt7IASQ+u1XZLhTYK9y4KlrwvUYVQGlO -DsaKEh/D/tfpneVvXp/apvA++jeOKY90ibgshl7ghCk2DKoDUujDSvsRHFmQsEWV -stE89UevbilMmNtd/8O7tYAQCyeVPWxlULmum8apcu6vJKh4bOZCSTvidIH7/oPv -9o/1DblOQiWTwqQpEDEki7f4keLZPTZ/1yRU4i9mCAmV7pSiWG7c8q6FAU1vmk6z -QWko2vE36ocDXHCV53evVl7JQI1keFgRHhAvb1tP+AjEm/y77wQnMT2b//MdM7x+ -tKTWtWnL1b3Dj1LnDtcgg80zxecM1rXFeiiDo2wbs2Nw78oDyfe/qMNE0QiMhtwJ -GmaOWTPj+FCSsvNRAo9bWAfslVjTlw7FPvz4j/Tm+Xtpjskzek3y5QvtkAsoYpCa -tLHkI8h1i8jJ8659KV0H/s8L0GMWzOMnKHVKybi6CHJCAxnzFPa3pKLlX47Hk1i8 -kB2al24ouR21yWWglW2pu+VrGKseYYLfOu3bVxbJsgcAhNw1TkQ= -=SSXP ------END PGP SIGNATURE----- diff --git a/libreoffice-help-24.2.0.3.tar.xz b/libreoffice-help-24.2.0.3.tar.xz new file mode 100644 index 0000000..01d9976 --- /dev/null +++ b/libreoffice-help-24.2.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c3542d8fa67eabebee758b608742838ced3182cf1851cfa4d636add8a8e428e +size 167071080 diff --git a/libreoffice-help-24.2.0.3.tar.xz.asc b/libreoffice-help-24.2.0.3.tar.xz.asc new file mode 100644 index 0000000..e9eb391 --- /dev/null +++ b/libreoffice-help-24.2.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWzlYwACgkQ9DSh76/u +rqP5/Q//Ws3KZB6sevx8UBadUu+m27Lrh5KdhhPvdVur0h2d7lzKdJ4CAo77FbzG +F7b6rIi8aIR3DYsuOcPUkCrLhgdaxc5hUzefddqJcwg3QJdJR1+kLmrUGcXtas3E +BYf48lOq+8cQqE4JzVy6H2lB1SA8RGOja7GMsaAhekX08BdvpkEo3tPGhuiE8ukI +mXIq/kQfVMGUzj2VL6LgJ6cwLOBwlE3plo37XscNeIOmGbrPfRPdWFYTfXgS/NJB +yXZuCI+US2Pz7sUSBeGtbVA0GYnuqMj4h1on/ADaRRk/W5/xH33KSiSsNsjaj+yR +49xv3/Yi6BKP155wMoKRvcyPoVcoj7K3tv5LWTd7n0+COXCZQEwbEb2fp+2pJr9l +fI55VbpofIdNlsV14vcVE7HQCEIQ+Z+UuohPJHjwQLyp2hw01DxmH0Fyloam7gnp +JArA6ogIdDRqsdDAjMiMWKLG7ZimXujDb2wA6IN6OXTf4PATT25RLizHGLASgASM +uOXEgowSYLsUX5vdsVP9mkO/UDFEx3GXeJK51pB3NKO5mJIx28U/wMwivXNyh0/h +3hIttiqaFXji+OGi7rY5yaSCaGyy3qvwT/T7z8xnEENELO+xOAIS4mPnOjjQa2X9 +TwKgCCxXk5LZqVKZrFH/n4REOtWlN5JJWvIvJuAEY/nuMtGJyMI= +=F9Ao +-----END PGP SIGNATURE----- diff --git a/libreoffice-help-7.6.4.1.tar.xz b/libreoffice-help-7.6.4.1.tar.xz deleted file mode 100644 index 08660dd..0000000 --- a/libreoffice-help-7.6.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed784c014096e0e7ff86294eba624bd92ecbe5be881b01950eecd69aed7d8678 -size 166959028 diff --git a/libreoffice-help-7.6.4.1.tar.xz.asc b/libreoffice-help-7.6.4.1.tar.xz.asc deleted file mode 100644 index 656832c..0000000 --- a/libreoffice-help-7.6.4.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVomxoACgkQ9DSh76/u -rqP1Ww//YVHYXzC8BGiECo/kN12myboJ9I38mnlQbEDvyjSjOlrOWOH1ytmQ5/YQ -nSiXk+5y3hqJJxZGWHw81Sc5OOdeYrRafGDTJbeT9/i8FIOlU43VWmq10P+pohZi -YQa1qQ2jJFwPm0f4jukocYgla5uNDGj0En9n+aSPfTGGT3v4zr0qeN4nN76Xu0GM -RQo+intr0V3GLinBqKLbmIVnOTQi+u4QHqG/MVB6n/6asdmFyeQOmHO7cWUGCEYc -kCqAf3wi5HJMNUpVu0LBqUIdqDklkdo+XwcVAM3L2PEDk4qgcrQaNyd8ztsp646i -/J7yDRJ/UXxG/X/2MbDg67N7Y+nf182iYxTFujis+379k9cRIUA7gftuSsPr1is6 -C0zA6qblxerhQmy4Y/1/RY0BnPGDjk45yZiewHslEetjukAXdREV7QfkMs8HIDsx -ib2D46ee7idDpqeBr9NVl8e3dhsyj6/NOwLMrtu5THOIArs6SIjU9KtTss0895h1 -ISRT/SEXiVMfCaxdU2nU6lZchmeeu+BgR56cWRAE8Fs14jXcIfzxKjy/+XhfgFgz -ctddbbPXan9/l7vHupHV2aqyPJgPh1LUnlciWYH8GSDlDYaKAy0GHrrlBJpF0ATx -gc8nbYXOZDKOQrGx7rZJWLLMuBoWgarLlBDI6TgDpXCPN4iViE8= -=yHnc ------END PGP SIGNATURE----- diff --git a/libreoffice-translations-24.2.0.3.tar.xz b/libreoffice-translations-24.2.0.3.tar.xz new file mode 100644 index 0000000..3e1b3a4 --- /dev/null +++ b/libreoffice-translations-24.2.0.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c69fcb6e6ea0878a016bb0e6061caa2ff40825bd14b054ffebe7c6a4390d264 +size 220379748 diff --git a/libreoffice-translations-24.2.0.3.tar.xz.asc b/libreoffice-translations-24.2.0.3.tar.xz.asc new file mode 100644 index 0000000..80a2973 --- /dev/null +++ b/libreoffice-translations-24.2.0.3.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmWzlY0ACgkQ9DSh76/u +rqONfA//dtPeUJXAkuQZG+2PBKvbsZphPgCGFgIl4i7pPU7/olYdBYjnnMZISSjN +xP0BfLa6hlc5tw6Dh8PgJRFt1SmhxkbsYJKo4V0iu6nIuZ8iS2YTax2+I1PRu7ZL +hsl7wJJr8h9ls9dOVu1mwr46071ilKcW0E0NnAhdu0th5pG/7d2Il9DSMRJZEx9R +G24H1suDC6rsnFaXYWpqaoRbwSZ4c5oBRYiwtgWhu7rZ4vCZQN8+dh0jI+BZ0yvP +43f/kbenQ9hL4HW3vCdS6Pjl+awUauzs/NyeSHJXMggFJ9ni0mdakanHwgk0M78y +P4o64n/19pE0YFvlTnVN5B6EUPf5Ue/TjC7Ioox/SWuVNNmgDQ31wVAM+viFwX0J +g+l7o+1P70SiZt1lWhgGBg5BSmcadhBtiJGwtIxeba+6O/UbLsPMhqzR+Dedd/2/ +u8vAdRN6xl7ufR6GNJyjIq54J8g5U5r1Cq5+dQekylUSGEswvkX39F44TooS1nGy +gsnvDnoWAJYKhYanh3EGhTpCmWY5d7GnIoYNWNpUrbd2TBCb/0e/LdHyE1Jx4gei +HZP9iGk9VhYnm5E3nhfUF4G45ktnew8tkj0Wu+HbyIjKnC4I/JsS4tOrsQlPGNj9 +s93NEk+3Ja2nCV19HdZSInBUJ5/pdtIoDO83fYbOzVsZGuinbrk= +=Yx/x +-----END PGP SIGNATURE----- diff --git a/libreoffice-translations-7.6.4.1.tar.xz b/libreoffice-translations-7.6.4.1.tar.xz deleted file mode 100644 index ba94041..0000000 --- a/libreoffice-translations-7.6.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a5a0dbe40abdc55cdd9994895f6577d7e547d26a36b20641f32f3640a3b7679 -size 216976788 diff --git a/libreoffice-translations-7.6.4.1.tar.xz.asc b/libreoffice-translations-7.6.4.1.tar.xz.asc deleted file mode 100644 index c8544c4..0000000 --- a/libreoffice-translations-7.6.4.1.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAmVomxsACgkQ9DSh76/u -rqNn7g//aslOCJ2Y3x+zzb9FEqHiBYNk1eDDVoZy43dGH9ga6t4JMJD6d+70npPQ -dXgEsE9+4yWpdeYdb9NuNj7SX1c955fW+vn6+7jMYJ2ILQD5ZmXuQhV4fQkF8Vi2 -/xCg7jwniweaVp8xVL0QgjFNGA3pdkVzgg73i/eYs4lwZKCbPUUMK9pLZDYTzATM -ZnIvk8KJo5MbXr+jPN/S/r9bnBqR2guR6XQUkv72RctN4V+v1wr5/uGETzxtLsoS -RfKQImfQGlc6ynlJaa6kD7n6gL677oCVRN7/swpEXqyhUDIrBExsREWGeI9hYlNA -i6CeMddPI41PwuSo3oX1mYI6JiR/TmMvcryQl+LbweWubWDTBayIjChpo/M4npfc -HcghgUkN7BA7xqVhepB9kOAvOnsqZrjVwbkvFNUJRiOBmctKIM9SXx5OuDdjzgox -1gxDHpq0UcUroD6jbIfsEw1e7TVOAVMoGwKj2S9CjZvPe1d6x88UX9v2i6XDjVwk -yKrXtmkHrbotLmfPrKHEfmrEa5N4MbtJs1VFIOawj4J6RBO/ewkFT5cJqdmDvq4x -xeba07ppHBaQNlc69SNJd/FfkUOh60QDk78gLsuD3NnvUbiALS8B2vLy32OakAfE -piNKlYwTsmpXFiUkzcWZy7VxAqj5Wi8SAQjb9inraGbewLhbBnI= -=20Cj ------END PGP SIGNATURE----- diff --git a/libreoffice.changes b/libreoffice.changes index d831706..8624231 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 21 18:45:44 UTC 2024 - Cor Blom + +- Update to 24.2.0.3 (24.2.0 final): + https://wiki.documentfoundation.org/ReleaseNotes/24.2 +- Armenian translation added +- Update patch handling to be compatible with rpm 4.20 + ------------------------------------------------------------------- Fri Dec 8 17:18:14 UTC 2023 - Fridrich Strba diff --git a/libreoffice.spec b/libreoffice.spec index f3c6818..a1e2f04 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -36,7 +36,7 @@ %bcond_with kdeintegration %endif # Use system gpgme and curl on TW and SLE15-SP4 or newer -%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150400 +%if 0%{?suse_version} > 1500 %bcond_without system_gpgme %bcond_without system_curl %bcond_without system_harfbuzz @@ -52,7 +52,7 @@ %endif %bcond_with firebird Name: libreoffice -Version: 7.6.4.1 +Version: 24.2.0.3 Release: 0 Summary: A Free Office Suite (Framework) License: LGPL-3.0-or-later AND MPL-2.0+ @@ -91,11 +91,11 @@ 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-5778.tar.bz2 +Source2008: %{external_url}/pdfium-6179.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 -Source2010: %{external_url}/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz +Source2010: %{external_url}/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz Source2012: %{external_url}/libcmis-0.6.1.tar.xz Provides: bundled(libcmis) = 0.6.1 # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse @@ -114,8 +114,6 @@ Patch11: fix_webp_on_sle12_sp5.patch Patch14: use-fixmath-shared-library.patch # PATCH-FIX-SUSE Fix make distro-pack-install Patch15: fix-sdk-idl.patch -# PATCH-FIX-SUSE Allow the use of old harfbuzz versions -Patch16: 0002-Revert-Require-HarfBuzz-5.1.0.patch # Build with java 8 Patch101: 0001-Revert-java-9-changes.patch # try to save space by using hardlinks @@ -124,6 +122,7 @@ Patch990: install-with-hardlinks.diff Patch991: libreoffice-no-destdircheck.patch # Fix build on sle12 Patch992: python34-no-f-strings.patch +BuildRequires: argon2-devel BuildRequires: %{name}-share-linker BuildRequires: ant BuildRequires: autoconf @@ -135,11 +134,12 @@ BuildRequires: cups-devel BuildRequires: fixmath-devel BuildRequires: libwebp-devel BuildRequires: zlib-devel +BuildRequires: libzxcvbn0-devel %if %{with system_curl} BuildRequires: curl-devel >= 7.68.0 %else -Source2013: %{external_url}/curl-8.4.0.tar.xz -Provides: bundled(curl) = 8.4.0 +Source2013: %{external_url}/curl-8.5.0.tar.xz +Provides: bundled(curl) = 8.5.0 %endif # Needed for tests BuildRequires: dejavu-fonts @@ -213,6 +213,8 @@ Source2026: %{external_url}/graphite2-minimal-1.3.14.tgz Provides: bundled(graphite2) = 1.3.14 Provides: bundled(harfbuzz) = 8.2.2 %endif +# Java-WebSocket +Source3000: %{external_url}/Java-WebSocket-1.5.4.tar.gz BuildRequires: pkgconfig(hunspell) BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(lcms2) @@ -230,7 +232,7 @@ BuildRequires: pkgconfig(libmspub-0.1) >= 0.1 BuildRequires: pkgconfig(libmwaw-0.3) >= 0.3.21 BuildRequires: pkgconfig(libnumbertext) >= 1.0.6 BuildRequires: pkgconfig(libodfgen-0.1) >= 0.1.4 -BuildRequires: pkgconfig(liborcus-0.18) +BuildRequires: pkgconfig(liborcus-0.18) >= 0.19.0 BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpq) @@ -322,23 +324,17 @@ Requires(postun):update-desktop-files %else # genbrk binary is required BuildRequires: icu -BuildRequires: java-devel >= 9 +BuildRequires: java-devel >= 17 BuildRequires: libbox2d-devel BuildRequires: libmariadb-devel BuildRequires: pkgconfig(icu-i18n) -BuildConflicts: java < 9 -BuildConflicts: java-devel < 9 -BuildConflicts: java-headless < 9 +BuildConflicts: java < 17 +BuildConflicts: java-devel < 17 +BuildConflicts: java-headless < 17 BuildRequires: pkgconfig(libopenjp2) %endif -# Dragonbox requires C++17 -%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 -BuildRequires: gcc >= 7 -BuildRequires: gcc-c++ >= 7 -%else -BuildRequires: gcc7 -BuildRequires: gcc7-c++ -%endif +BuildRequires: gcc12 +BuildRequires: gcc12-c++ %if 0%{?suse_version} # needed by python3_sitelib BuildRequires: python-rpm-macros @@ -346,12 +342,12 @@ BuildRequires: python-rpm-macros %if %{with system_gpgme} BuildRequires: libgpgmepp-devel >= 1.14 %else -Source1000: %{external_url}/gpgme-1.18.0.tar.bz2 -Source1001: %{external_url}/libgpg-error-1.43.tar.bz2 +Source1000: %{external_url}/gpgme-1.20.0.tar.bz2 +Source1001: %{external_url}/libgpg-error-1.47.tar.bz2 Source1002: %{external_url}/libassuan-2.5.6.tar.bz2 -Provides: bundled(gpgme) = 1.18.0 +Provides: bundled(gpgme) = 1.20.0 Provides: bundled(libassuan) = 2.5.6 -Provides: bundled(libgpg-error) = 1.43 +Provides: bundled(libgpg-error) = 1.47 %endif %if %{with firebird} BuildRequires: pkgconfig(fbclient) @@ -951,6 +947,7 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %langpack -l hr -n Croatian -m hr_HR -X -T %langpack -l hsb -n Upper_Sorbian -T -X %langpack -l hu -n Hungarian -X -m hu_HU -T +%langpack -l hy -n Armenian %langpack -l it -n Italian -X -m it_IT -T %langpack -l id -n Indonesian -T -M -X %langpack -l is -n Icelandic -T -X -M @@ -1028,26 +1025,23 @@ Provides %{langname} translations and additional resources (help files, etc.) fo %setup -q -b2 -b4 %if 0%{?suse_version} < 1500 # The rename of the configdir is needed only on older than factory for compat -%patch1 +%patch -P 1 %endif # Leap 42/SLE-12 -%patch2 -%patch3 -%patch6 -p1 -%patch9 -p1 +%patch -P 2 +%patch -P 3 +%patch -P 6 -p1 +%patch -P 9 -p1 %if 0%{?suse_version} < 1500 -%patch10 -p1 -%patch11 -p1 -%patch101 -p1 +%patch -P 10 -p1 +%patch -P 11 -p1 +%patch -P 101 -p1 %endif -%patch14 -p1 -%patch15 -p1 +%patch -P 14 -p1 +%patch -P 15 -p1 +%patch -P 990 -p1 +%patch -P 991 -p1 %if 0%{?suse_version} < 1550 -%patch16 -p1 -%endif -%patch990 -p1 -%patch991 -p1 -%if 0%{?suse_version} < 1550 -%patch992 -p1 +%patch -P 992 -p1 %endif # Disable some of the failing tests (some are random) @@ -1098,13 +1092,11 @@ ARCH_FLAGS="`echo %{optflags} -flifetime-dse=1 | sed -e 's/^-g /-g1 /g' -e 's/ - ARCH_FLAGS="`echo %{optflags} | sed -e 's/^-g /-g1 /g' -e 's/ -g / -g1 /g' -e 's/ -g$/ -g1/g'`" %endif CFLAGS="$ARCH_FLAGS" -CXXFLAGS="-std=c++17 $ARCH_FLAGS" +CXXFLAGS="-std=c++20 $ARCH_FLAGS" export ARCH_FLAGS CFLAGS CXXFLAGS -%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 -export CC=gcc-7 -export CXX=g++-7 -%endif +export CC=gcc-12 +export CXX=g++-12 # Fake the epoch stuff in generated zip files export SOURCE_DATE_EPOCH=$(date -d "$(head -n 2 %{_sourcedir}/%{name}.changes | tail -n 1 | cut -d- -f1 )" +%%s) diff --git a/pdfium-5778.tar.bz2 b/pdfium-5778.tar.bz2 deleted file mode 100644 index e0851b5..0000000 --- a/pdfium-5778.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06 -size 9532052 diff --git a/pdfium-6179.tar.bz2 b/pdfium-6179.tar.bz2 new file mode 100644 index 0000000..e9e56fc --- /dev/null +++ b/pdfium-6179.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d3f08fe0e2fda86246832085426616826dcca0912202874428bfbc24d13d95c +size 9907097 diff --git a/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz b/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz deleted file mode 100644 index e371c31..0000000 --- a/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9 -size 10693272 diff --git a/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz b/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz new file mode 100644 index 0000000..03246aa --- /dev/null +++ b/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01 +size 10868024