diff options
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/Manifest.gz | bin | 8603 -> 8599 bytes | |||
-rw-r--r-- | app-office/libreoffice/Manifest | 9 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch | 58 | ||||
-rw-r--r-- | app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch | 57 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-24.2.6.2.ebuild | 2 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-24.2.9999.ebuild | 2 | ||||
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 15 | ||||
-rw-r--r-- | app-office/texstudio/Manifest | 4 | ||||
-rw-r--r-- | app-office/texstudio/metadata.xml | 2 | ||||
-rw-r--r-- | app-office/texstudio/texstudio-4.8.4-r2.ebuild (renamed from app-office/texstudio/texstudio-4.8.4-r1.ebuild) | 5 |
10 files changed, 134 insertions, 20 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 59c8f2549a79..4865798f83bf 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 667f67190923..c43d2b8273a4 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,6 +1,8 @@ AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69becd02b0b93c2fcb5fd4387a54424b9fa552ebfa128290a1b0551e6b6fe5de8f57025a2ebf5c75da2ea01bd66f5910f9d6 SHA512 dc00b2afe98f7bf30637c4102e336d6781f76cd7eb6c339c0b369ec2aa50544bc266fd42540fea037c1fcd07ae7e6d1b6503be620db9127084ffe6528f8db4b1 AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb AUX libreoffice-24.2.3.2-fix-bashism.patch 2016 BLAKE2B 4bf97ed1f62232c777715f9f93f65eed50275bd8a00b53ac551024bcccf1faa497ac5e45e56274e86d74f82a1c4094a2c85388503131181af9b2a3e11ba6a75c SHA512 f7f1c46d854d2fbeffa0a65c58447f8a662d85b98b2ec2b8f0734ae382ec8c40ef93f1eb7271e5fd160e6204e176cba9de02fd755a0041c5fa930784dc198960 +AUX libreoffice-24.8-unused-qt5network.patch 3095 BLAKE2B 32c696893de2543c27bd390bcf05506855cad57dd3c568c544f6514ab1e46887625d83ce2f311c436b175332db174b2bcb090837fdc361e4bd4e1f9377f4895f SHA512 47148c0ef291e84bff564ddb0f462d7b88bb07f6a79dbed4cbe4fdaf7168b38a814f9efa2b37604665894c130526054a767975b81b97daf1e2744559dd31f9c5 +AUX libreoffice-24.8-unused-qt6network.patch 3227 BLAKE2B f2fca932af55e949854e3624c281b81b124612edf4fc1d9949e2f494ddd51650eb8aaec78ee07c6895c351ab34e5ad214fffde6b63e03e343d93d69e06ab13cb SHA512 d187359add55a7c6336f9afaccbf2fc51120a45d1bbc29e1bdeac060b46c41c2ebd028efe95f080abf0aabfdae8a7165a35cec94ab18d373444ff2bed0af63d8 AUX libreoffice-5.3.4.2-kioclient5.patch 605 BLAKE2B 30961066c080c4d06ca978b7c0ad4b57a3739d6d34a2941f2ea57d3a5c4ab65e3f3c2376243aa88c9c05b1038cf9bfb7605a370d11513bb4553de2d268010519 SHA512 2aa6d1fc96749b79b3291f6e27630c6cf59d2c743f0dd8603867ba8aec2c17f87b70e1dd031365013f7e9ea53c160e9cb3f48af592a587dc05f3ae4cc1b35df6 AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 AUX libreoffice-7.6-unused-qt5network.patch 3218 BLAKE2B 1445716fcfb556d7ef997bf1f5bf8dbb75032e9556d878fd999c6d260b2bff9e445cfec5f2a7537fe5118f31a1574cc21badb62b4a70b2452f694f03e75d2fd7 SHA512 e9861f2acfda59d09fc2f5431e4697a9bbd0927c5a765e35e7418b60ed0aeeafcaac3873fd0222b57facf71f4375a095a75e57574cd36e02f8ade0f264993647 @@ -16,6 +18,7 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 BLAKE2B 9cbcda7d7644ede32a19b7bd5e29cae348229b9396a205809db480ed67bf12d243652d4ec3bf817f6d369e594a6d6ac3ebebfd03a80ed94f3106f78421d00077 SHA512 12ab17a4db3f7c834b21e59ff6f6f6456630d8626db7fb908867b20204295d4fba8969e79a3694ca66cb24e9f0e5a0fa4b9d2d3f748691b7f93985f9e666ce5f DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 BLAKE2B 86cf869561f653e449611ca2f014b340d7d0cba46b7d37a9455cbbc184b6a5c7e0e26ac84909aef08ae8639a402cef3bfc93ec901de018060f16413eaff0f748 SHA512 17ba9d2c0376fb7326d53bb1e3796610176a1af426d1b9073b5f7cf06c93d865e585c495e75c52fb8e426d7c453e751356a9ca9a54dc821ddadb6c8160ed5ba6 DIST Java-WebSocket-1.5.4.tar.gz 189725 BLAKE2B f90700d58d7230e1a3ab32d07bdfc11a1ec6ceffbc094b4b0dc8bfd83cf1d060400c758de8bf47fb593dd07927f95a9e7ab70617b4a1afb64b09e225771b2c5e SHA512 e195ccaa97a7f167a7b27a28226a0bccde7a5cc3cde9b3e718860bd7ceb86da2c272ec2512cb1d0d893dbd6ac47633978a44a8620a2ffbb0652aaeeb2c4ecb08 +DIST Java-WebSocket-1.5.6.tar.gz 190604 BLAKE2B bdaa36313872d0489125d1fcd487a978cc7b82e8ad8084e447d92d052fcfa67f1a9042e45bdbee486b19ea2d18b622572246bb4ce4564618c7c7ab21aa073b9c SHA512 452c28af503ec184ece224fadcab0fed718fb6d71856c552160075a287c1473d31aae0ac0094de31619b195d7a5aa0015d03f2f448c8c5af0f21c67b1d9c3ca1 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip 2929311 BLAKE2B 02f59a60592d92f97f1098b501617d1408cabeab7b5a85b2f20ade584536e71823c392ce86084a944cada86310d48afb475535b47420f9b54eff582ce1d77d85 SHA512 58c1aa3965bf3a5f5d0facb67a5e42cec04e3f74e59cd7348ea2a9f6d9cafdce5552677c6b6d9c4cf2b31f52751695f2e53b2cee658e5f2eacb1393534a53c0e DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 BLAKE2B 85ddb6e24475f32e4fa105add3ace0afa686b739e34958e8a47653668153d1bebcec77dbdeeb83bef566453e624fd7ebb0595f7d429005dac1c9af30f861e708 SHA512 654d2408c11349c90ae7d80b0c1997ee831004bc4ee36a706a0d8a84617fd0f82a97c5b45ab2388d60085afaec59a02eada007a8a1e14c3b366cabd36b7607ec @@ -36,7 +39,7 @@ DIST libreoffice-help-24.2.6.2.tar.xz 167013048 BLAKE2B 026c783643433da61cf29dcf DIST skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz 10868024 BLAKE2B ce8247de4cd6939b0593adf1c3dc6b78cdf4220fbcd2dfb2b9cf6d80d42f9c49f4d93fbe3cff68d079f04cc5801daf20999b288f7fdc85b58e32035151a3616a SHA512 6c10785ed9ab8cdf3385ebd3f3d13a64b850df9cc7a12e513326a84c7a3e6f6235f9f4dbce128eac2e43a2707fe6a6011716de5985adf4742d55879210bf32e9 DIST zxcvbn-c-2.5.tar.gz 1404434 BLAKE2B f0f22fc8643f785e8f9ed42033d6654c2e67aa4e258bbc4fecf533efcf8b86b6d7e67f9042326247c311c42a4e2b24b844e0bae65cdb2e46ea043a2974ffd857 SHA512 d7199b3cc36cd0e401bd8f857132425908307aefcdb1bb635ee81c34cf71ccbcdf0fe36a336a55da1281692b508881b54773afa41379a448863095f4abd5c0e8 EBUILD libreoffice-24.2.4.2-r1.ebuild 20416 BLAKE2B 6c431ea8cd6d299764a68b584d83f36a2470d2905ec45acfb63a3a39bd70be15ab7110d1e54d1397a028efee5a5832d83c3ff279d2f18c3ec6a77469ac3b0589 SHA512 f264cf1d5da29ab6118fe767b816f0a7d5d6500f4670359bb485b1e3396ca69daa215c4709d0f708e6efe1a85dc6324ba2c61a03d35d1f09095553e3c74d8ded -EBUILD libreoffice-24.2.6.2.ebuild 20719 BLAKE2B f76a7e149a0222eefdff82e712d235c98d238839a39847e8fa2da905254a9bf453f5266c14258ec617767d6a3382950676e97ff9f0ae04a976af20df9819f262 SHA512 a7e5363753647ba3dab0ef3f732bb80ed7669fe48a3e3c1abe1220339487f1b292a4ec29c32929b3a437a80398f5e1979446d91e56cd7081d8c681728403e4de -EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 -EBUILD libreoffice-9999.ebuild 19906 BLAKE2B 0b242c2390bec879c05a78e17bab5b1363555bd0473f89927a6736d5a68d0da9c8cad53197a58d82ef4869cfead3838814150f9c7d731f49b0fb4388b177c68b SHA512 b225f0125d7bc88fc5b4b24fc8702641f1169f151a852b8dc3d02e8c54a6f4bfe97198020b219e5155f945d71f086874ac59a2dcd7190b88da6636ac3c75c329 +EBUILD libreoffice-24.2.6.2.ebuild 20719 BLAKE2B 7af8205a122c67abf195e536e499402f68e2024bd3f97bd83885bda29b28d3b224f62d93777ca235ee4ff14cfe5888cff35963cefb4abf34aba09bae17cef301 SHA512 1b9f46208297dde97bcd4fd63a33df8bffa6e15d65956e3024e7c79292575e7833f85b71e6f5d35f5a71a4be039124b318103b2fb2a0babf5a8e0b2585d31db1 +EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 42521f7963506688ba8745758f3b0382f6a87f841305b979311f37a57349bb08dad8916d7fae1d5626fa7144cca081989900d311a610352229d10bb7e9f42ea0 SHA512 8cf7e4107a241246b4fa78c30bbd3267795ff38c85599e19d6951482df296de169e382a6b6f8150f572d75528bc612821569c6cb4a76a2c01912e9263ab0b27d +EBUILD libreoffice-9999.ebuild 19483 BLAKE2B 8ef4ff672cd190f78d9084f8a894f14582347ad1ec37e2eab74119a5b37a4807438a153a8af391657db8d5e6977cb3233999e95912b8162851707ade963e7645 SHA512 6a27e69c7f3814d2292e156dab08e5ebd148a48b9dd25a14f091506603fb651c6f3aa5a4d85a210bb628e2033963bde661f639b944d874910a4177f3c83bcd15 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch b/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch new file mode 100644 index 000000000000..6aeb3e9e9dac --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch @@ -0,0 +1,58 @@ +From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 12 Mar 2024 21:40:25 +0100 +Subject: [PATCH] Drop unused QtNetwork dependency, fix KDE terminology + +'KDE version' -> 'KDE Frameworks version' + +Change-Id: I2e6a912be93d79b251dcf32c20796374c9ca9cf2 +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6d56df8625f1..9d6b35b747e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13213,7 +13213,7 @@ then + + QT5_CFLAGS="-I$qt5_incdir -DQT_NO_VERSION_TAGGING" + QT5_CFLAGS=$(printf '%s' "$QT5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") +- QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" ++ QT5_LIBS="-L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets" + if test "$_os" = "Emscripten"; then + QT5_LIBS="$QT5_LIBS -lqtpcre2 -lQt5EventDispatcherSupport -lQt5FontDatabaseSupport -L${qt5_platformsdir} -lqwasm" + fi +@@ -13442,8 +13442,8 @@ then + AC_MSG_ERROR([KF5 libraries not found. Please specify the root of your KF5 installation by exporting KF5DIR before running "configure".]) + fi + +- KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -I$qt5_incdir/QtNetwork -DQT_NO_VERSION_TAGGING" +- KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets -lQt5Network" ++ KF5_CFLAGS="-I$kf5_incdir -I$kf5_incdir/KCoreAddons -I$kf5_incdir/KI18n -I$kf5_incdir/KConfigCore -I$kf5_incdir/KWindowSystem -I$kf5_incdir/KIOCore -I$kf5_incdir/KIOWidgets -I$kf5_incdir/KIOFileWidgets -I$qt5_incdir -I$qt5_incdir/QtCore -I$qt5_incdir/QtGui -I$qt5_incdir/QtWidgets -DQT_NO_VERSION_TAGGING" ++ KF5_LIBS="-L$kf5_libdir -lKF5CoreAddons -lKF5I18n -lKF5ConfigCore -lKF5WindowSystem -lKF5KIOCore -lKF5KIOWidgets -lKF5KIOFileWidgets -L$qt5_libdir -lQt5Core -lQt5Gui -lQt5Widgets" + KF5_CFLAGS=$(printf '%s' "$KF5_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + + if test "$USING_X11" = TRUE; then +@@ -13453,7 +13453,7 @@ then + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $KF5_CFLAGS" +- AC_MSG_CHECKING([whether KDE is >= 5.0]) ++ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.0]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <kcoreaddons_version.h> + +@@ -13461,7 +13461,7 @@ int main(int argc, char **argv) { + if (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 0) return 0; + else return 1; + } +- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[]) ++ ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi +-- +2.44.0 + diff --git a/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch b/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch new file mode 100644 index 000000000000..6006d28686d0 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch @@ -0,0 +1,57 @@ +From d4287704f9e2ea07e0750b114ec0761c2732d03e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 12 Mar 2024 21:40:25 +0100 +Subject: [PATCH] Drop unused QtNetwork dependency, fix KDE terminology + +'KDE version' -> 'KDE Frameworks version' + +Change-Id: I2e6a912be93d79b251dcf32c20796374c9ca9cf2 +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 6d56df8625f1..9d6b35b747e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -13667,7 +13667,7 @@ then + + QT6_CFLAGS="-I$qt6_incdir -DQT_NO_VERSION_TAGGING" + QT6_CFLAGS=$(printf '%s' "$QT6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") +- QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" ++ QT6_LIBS="-L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets" + if test "$_os" = "Emscripten"; then + QT6_LIBS="$QT6_LIBS -lQt6BundledPcre2 -lQt6BundledZLIB -L${qt6_platformsdir} -lqwasm -sGL_ENABLE_GET_PROC_ADDRESS" + else +@@ -13857,15 +13857,15 @@ then + AC_MSG_ERROR([KF6 libraries not found. Please specify the root of your KF6 installation by exporting KF6DIR before running "configure".]) + fi + +- KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -I$qt6_incdir/QtNetwork -DQT_NO_VERSION_TAGGING" +- KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets -lQt6Network" ++ KF6_CFLAGS="-I$kf6_incdir -I$kf6_incdir/KCoreAddons -I$kf6_incdir/KI18n -I$kf6_incdir/KConfig -I$kf6_incdir/KConfigCore -I$kf6_incdir/KWindowSystem -I$kf6_incdir/KIO -I$kf6_incdir/KIOCore -I$kf6_incdir/KIOWidgets -I$kf6_incdir/KIOFileWidgets -I$qt6_incdir -I$qt6_incdir/QtCore -I$qt6_incdir/QtGui -I$qt6_incdir/QtWidgets -DQT_NO_VERSION_TAGGING" ++ KF6_LIBS="-L$kf6_libdir -lKF6CoreAddons -lKF6I18n -lKF6ConfigCore -lKF6WindowSystem -lKF6KIOCore -lKF6KIOWidgets -lKF6KIOFileWidgets -L$qt6_libdir -lQt6Core -lQt6Gui -lQt6Widgets" + KF6_CFLAGS=$(printf '%s' "$KF6_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + + AC_LANG_PUSH([C++]) + save_CXXFLAGS=$CXXFLAGS + CXXFLAGS="$CXXFLAGS $KF6_CFLAGS" + dnl KF6 development version as of 2023-06 uses version number 5.240 +- AC_MSG_CHECKING([whether KDE is >= 5.240]) ++ AC_MSG_CHECKING([whether KDE Frameworks is >= 5.240]) + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include <kcoreaddons_version.h> + +@@ -13873,7 +13873,7 @@ int main(int argc, char **argv) { + if (KCOREADDONS_VERSION_MAJOR == 6 || (KCOREADDONS_VERSION_MAJOR == 5 && KCOREADDONS_VERSION_MINOR >= 240)) return 0; + else return 1; + } +- ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE version too old])],[]) ++ ]])],[AC_MSG_RESULT([yes])],[AC_MSG_ERROR([KDE Frameworks version too old])],[]) + CXXFLAGS=$save_CXXFLAGS + AC_LANG_POP([C++]) + fi +-- +2.44.0 + diff --git a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild index 0f81657dd272..32fab19772f9 100644 --- a/app-office/libreoffice/libreoffice-24.2.6.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.6.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" MY_PV="${PV/_alpha/.alpha}" diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild index 1360d7d1e65e..5e8997ea8a2a 100644 --- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" MY_PV="${PV/_alpha/.alpha}" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index a4aacb61b9f0..c3344edaa200 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="threads(+),xml(+)" MY_PV="${PV/_alpha/.alpha}" @@ -70,15 +70,11 @@ ADDONS_SRC=( )" # Java-WebSocket: not packaged in Gentoo, https://github.com/TooTallNate/Java-WebSocket "java? ( - ${ADDONS_URI}/Java-WebSocket-1.5.4.tar.gz + ${ADDONS_URI}/Java-WebSocket-1.5.6.tar.gz ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" - # Does not build with 1.6 rhino at all - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" - # requirement of rhino - "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # not packageable "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" ) @@ -301,8 +297,8 @@ PATCHES=( "${FILESDIR}/${PN}-24.2-qtdetect.patch" # TODO: upstream - "${FILESDIR}/${PN}-7.6-unused-qt5network.patch" - "${FILESDIR}/${PN}-24.2-unused-qt6network.patch" + "${FILESDIR}/${PN}-24.8-unused-qt5network.patch" + "${FILESDIR}/${PN}-24.8-unused-qt6network.patch" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -579,9 +575,6 @@ src_configure() { use libreoffice_extensions_scripting-beanshell && \ myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) - - use libreoffice_extensions_scripting-javascript && \ - myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 rhino.jar) ) fi tc-is-lto && myeconfargs+=( --enable-lto ) diff --git a/app-office/texstudio/Manifest b/app-office/texstudio/Manifest index bd19b66b8f9a..239b2633d80b 100644 --- a/app-office/texstudio/Manifest +++ b/app-office/texstudio/Manifest @@ -2,5 +2,5 @@ AUX texstudio-4.7.0-quazip.patch 708 BLAKE2B 0d989cd71dbca6a65d87488bc7dc0bfe293 DIST texstudio-4.7.1.tar.gz 111614038 BLAKE2B 01334389930fff5147f49a55b925a64173b8615553b58aaf48a9c9e446997aa0a2600f88a9bd4e5d81f5bef29c97d21796171c2dba231c9f3377c200e6ec676f SHA512 3aebc09f1cec288d841552b3861c4ba33f006b25e9f99418e53bdc0e5a3ece915c1649e7027e3626eec14b6c00214df2eb2012b7a0b71874b0f75cc9f9fb2d06 DIST texstudio-4.8.4.tar.gz 114147594 BLAKE2B 0f553bea66ef0709434ee8b3afc20db6b8ddce45f1f4a923768215d880b4428acefa54942aa99b36b2f03674de2935d8434a8689e1062e52b05e477de4b56416 SHA512 c42d475f1807feaaf86b0245d8a71ccc28172c5867224383bdc3b4e4c719577c7fbc9b2f3ddac90ad957a9bacd36ecc79accea5d0453552d3856b66129091538 EBUILD texstudio-4.7.1.ebuild 1838 BLAKE2B 6d1b32ed6929d1da46bfd36f446b85451713713e87f37a8592c99e760fd21be01ba201c69fcc69f1f344ea248514233000b1a0f7b0717f9fbcac16da2dd28566 SHA512 600f556bc56338ce3774217231581ff1662854c251f4a2444825a5b45a0256e11dd199c1022367829e7ecfe71338c0fd798842d00bb96716a2cd0cb9abf34b89 -EBUILD texstudio-4.8.4-r1.ebuild 1445 BLAKE2B 9b95100f6c0cfd30174af69f05834b9e09c3e6d5a2f2fe89ec22fe20db302f86873147b665416e9510b7ef46425222f0e18cc5080ca64a4f52f7f0d5468ddde3 SHA512 93d3785b92d9c3cf5c2f0253b023875ec4fddeb53524d1f12c1c7ff95a918053c969c1c09a475e792fb748423961f04864ffae65d30f290864a5132ae5b353d5 -MISC metadata.xml 529 BLAKE2B d8b78ba95403c235139ec1371c7d4429d75ee40d5e7b6dae9cf5871e50bd27dda283415827d8d5682ccb82904d1bfc6eba93dbbfae4d4cfbdb91f4796fbddf9e SHA512 0fc0c0468e7ae07577d2a392537a44c775cd0ef8fc88aa7fc18b6db7c650dbdc651fcb9eedd6315bc9f85e9b3e11a0e35eb9656a93511c187a11bd75f6655886 +EBUILD texstudio-4.8.4-r2.ebuild 1535 BLAKE2B 156dc4492b585ceb85532f08a9383d057ed0fa2e9a238c6fdbbc1e18059cb2e0001c048a351d602411f70e07188bbe2928e43e98addeabb44a0b7dad3cec05c1 SHA512 f3d56127269de0b67e8b31b235723e8356f57542d4cb5e8af559a68401d8e15d4f7124b67d4cfb28976b44b118481abe64485de0ef7085fbe58d400a6fe2d8d8 +MISC metadata.xml 531 BLAKE2B bd4e3fd56a35f20de00890a2517cd62713ef946ed205df7b00cb6a6287c28bf7f440323aecb5ba29edb5f9660fb2b3d040e4cec88a3f21f3b6e4d091409ef55e SHA512 c91e7b373fca96e9610d8f795ab72b3f40930167fb8e60c3e70a06cf3a0a257e707fff2f5baf27653a2d752235d4f3294c47fffd47cf6d6416f8ec5502c6bc8b diff --git a/app-office/texstudio/metadata.xml b/app-office/texstudio/metadata.xml index 6d59b3acc8f2..a92a8d4aef12 100644 --- a/app-office/texstudio/metadata.xml +++ b/app-office/texstudio/metadata.xml @@ -6,7 +6,7 @@ <name>Gentoo TeX Project</name> </maintainer> <use> - <flag name="video">Use phonon for video embedding</flag> + <flag name="video">Enable video player in pdf files</flag> </use> <upstream> <remote-id type="github">texstudio-org/texstudio</remote-id> diff --git a/app-office/texstudio/texstudio-4.8.4-r1.ebuild b/app-office/texstudio/texstudio-4.8.4-r2.ebuild index 43bd8a076684..cc3750320cfb 100644 --- a/app-office/texstudio/texstudio-4.8.4-r1.ebuild +++ b/app-office/texstudio/texstudio-4.8.4-r2.ebuild @@ -15,6 +15,8 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="video" + DEPEND=" app-text/hunspell:= app-text/poppler:=[qt6] @@ -22,11 +24,11 @@ DEPEND=" dev-qt/qt5compat:6 dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] dev-qt/qtdeclarative:6 - dev-qt/qtmultimedia:6 dev-qt/qtsvg:6 dev-qt/qttools:6[widgets] sys-libs/zlib x11-libs/libX11 + video? ( dev-qt/qtmultimedia:6 ) " RDEPEND=" ${DEPEND} @@ -56,6 +58,7 @@ src_configure() { local mycmakeargs=( -DQT_VERSION_MAJOR=6 ) + use video && mycmakeargs+=( -DTEXSTUDIO_ENABLE_MEDIAPLAYER=ON ) cmake_src_configure } |