diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-26 19:26:07 +0000 |
commit | acfd7c956a7b45da7af1452ec12e0b2d5e6ac65b (patch) | |
tree | 13151a7440c2560b01e3cf5bd56ad280482b88bf /app-office | |
parent | 67dbd3ba144944fbf4b466be1b5fa0569b774e6f (diff) |
gentoo auto-resync : 26:02:2025 - 19:26:07
Diffstat (limited to 'app-office')
-rw-r--r-- | app-office/Manifest.gz | bin | 8436 -> 8441 bytes | |||
-rw-r--r-- | app-office/joplin-desktop/Manifest | 4 | ||||
-rw-r--r-- | app-office/joplin-desktop/joplin-desktop-3.3.2.ebuild (renamed from app-office/joplin-desktop/joplin-desktop-3.2.3.ebuild) | 11 | ||||
-rw-r--r-- | app-office/libreoffice-bin/Manifest | 2 | ||||
-rw-r--r-- | app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild | 2 | ||||
-rw-r--r-- | app-office/libreoffice/Manifest | 2 | ||||
-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 |
8 files changed, 9 insertions, 127 deletions
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz Binary files differindex 315adeefb014..cb9bb959c41f 100644 --- a/app-office/Manifest.gz +++ b/app-office/Manifest.gz diff --git a/app-office/joplin-desktop/Manifest b/app-office/joplin-desktop/Manifest index df64d6076b16..bc1975046a0b 100644 --- a/app-office/joplin-desktop/Manifest +++ b/app-office/joplin-desktop/Manifest @@ -1,11 +1,11 @@ DIST Joplin-3.2.11.AppImage 226032261 BLAKE2B 8c0907f19e884343511ee6fd4544e8174b8fe58276e4903f4033f25b2f96e435e53eb8aeebdac4c4e57ab1353dcfd9007095bf7f682c41815644ffc2d1035f61 SHA512 c818b0ad9540e3af6c7295c6b19dba18bb2dfb19fe69bb78d63f0f2318b5d1f95dde99e86e74f693afa4f1535fce04f769ca5870d4bc00e1854025e63bc36309 DIST Joplin-3.2.12.AppImage 226036685 BLAKE2B f4bcbf71774c41c8b01850c14a67ce8f4ebdf2e964c45c4741a0f1808283f9d50b9904a420e640abf038d6aee79f3a7cdc49ff0d3ac8d35b28204df4a303390a SHA512 aecdda99475f0d37e5647bd7a270f0554afa8e626e78f2494aa24a0303a8d9061c49e495fc7750aca7700c489ff98090934f8f1d78327e2c91582a95a4824313 -DIST Joplin-3.2.3.AppImage 386823720 BLAKE2B f75938fbe5a8a4de995966b5bbbd6bbb38a2581cf211b29e87a38587573ac49486957455a49a676c0a26a1c531bea48e09905caecd3c437bbda85cc0f1cd550a SHA512 b7019bf7a16edc4dbfbee9b9e76f0ef792267c044b4bd7c35aec1befdcb41b698640f5e2ba167883f4132da98db19b0c53c0e0757f4ce81683d0f410952fc43d DIST Joplin-3.2.4.AppImage 282754638 BLAKE2B 612bbe8d3a972d63afc67a399ccd5cd8dd114e1338406203be8e9092340a794e7579ae318d0c7210584169328487b0674ed8bb6f0a3372459e93a25464f5ff31 SHA512 4e3273ccf10cfdc731e4c616bf72bd6827a48934938b2ad7dc2c7750cf66c2b0ed23b4bd4825b1fd561ca5115ec1bb5f13a1ecb54a90e260b48999b9e70e498d DIST Joplin-3.2.7.AppImage 226047655 BLAKE2B 407aaddb916b5082b6c040dfa4510d03564612634eb236f2f58fe6217ec57319393073762633eb20988e48bd89eebb3233c068cb812e5e341229e2ee5520f08f SHA512 211aff435bb9d493087eb0906d50424d4a4ab740b4ef0a054a34949eb65a49adf45ba4efc1b738fd4d81fc0012d7c7ba1293b36ff3fd213ab64dc6b1323f34dc +DIST Joplin-3.3.2.AppImage 224805353 BLAKE2B 9192d5c3cecc909d185aa4a58b534dd074a265519c755ac35a4e86461f23625a244f4e9af82051246b65d6c600362c75fe5aece2cf6833d72cf3da9d1c6a0bc7 SHA512 2224246266507f01f5e03e4c87e90364cf27edc83f21e1c20d592e8a35339f63032127813407d12dfc30b822ab7bfa9b01bc63e4eed396e83242f7bb3b23be99 EBUILD joplin-desktop-3.2.11.ebuild 2352 BLAKE2B 0b6e26f778871619dc140e2b2334674925f614524c4557ce8279de9a24e3303e4fec3bbe8827d87db30af75d9f2883ed208e714d7955165b8f006a1a479be160 SHA512 f70124f4dd6648e2a05cb1f63dd4bf5505410db256623dfc43057e651107f2831734bb0953fac3baa53c3724a8e559abaec12b68193ea86b364a0ed263fc67f1 EBUILD joplin-desktop-3.2.12.ebuild 2352 BLAKE2B 0b6e26f778871619dc140e2b2334674925f614524c4557ce8279de9a24e3303e4fec3bbe8827d87db30af75d9f2883ed208e714d7955165b8f006a1a479be160 SHA512 f70124f4dd6648e2a05cb1f63dd4bf5505410db256623dfc43057e651107f2831734bb0953fac3baa53c3724a8e559abaec12b68193ea86b364a0ed263fc67f1 -EBUILD joplin-desktop-3.2.3.ebuild 2413 BLAKE2B 07316242320ee24006ec4ec8964262ffd41985ef4bfb5045d6c2659041eba726b5bb88b92c35b7b62153ba71947d83c223b59b230d39cad8c9016295b3cac3ff SHA512 c3f6dd3b7d486c9811560dc8f29c40135a86a8e68e5072c1bb81120bbed6059eacaad8068e221fe4023c84bcbb6309b105510a06b061c6baae4412d7e8663244 EBUILD joplin-desktop-3.2.4.ebuild 2413 BLAKE2B 07316242320ee24006ec4ec8964262ffd41985ef4bfb5045d6c2659041eba726b5bb88b92c35b7b62153ba71947d83c223b59b230d39cad8c9016295b3cac3ff SHA512 c3f6dd3b7d486c9811560dc8f29c40135a86a8e68e5072c1bb81120bbed6059eacaad8068e221fe4023c84bcbb6309b105510a06b061c6baae4412d7e8663244 EBUILD joplin-desktop-3.2.7.ebuild 2352 BLAKE2B 0b6e26f778871619dc140e2b2334674925f614524c4557ce8279de9a24e3303e4fec3bbe8827d87db30af75d9f2883ed208e714d7955165b8f006a1a479be160 SHA512 f70124f4dd6648e2a05cb1f63dd4bf5505410db256623dfc43057e651107f2831734bb0953fac3baa53c3724a8e559abaec12b68193ea86b364a0ed263fc67f1 +EBUILD joplin-desktop-3.3.2.ebuild 2352 BLAKE2B 0b6e26f778871619dc140e2b2334674925f614524c4557ce8279de9a24e3303e4fec3bbe8827d87db30af75d9f2883ed208e714d7955165b8f006a1a479be160 SHA512 f70124f4dd6648e2a05cb1f63dd4bf5505410db256623dfc43057e651107f2831734bb0953fac3baa53c3724a8e559abaec12b68193ea86b364a0ed263fc67f1 MISC metadata.xml 755 BLAKE2B 2f95bccd9fb7bf21b253a524950c4775273c2d1911ebf4b90a392f8c2c7f38e986af0fbd217287595ba39a684609d8df6f275e146388aa0331169e51ba6fc823 SHA512 b62f1dfc822413386115305900866f6cf16fc2071425d2f0f515f537a29bf282d65c31b7f59ccf9187280456eb759a5fcce7340fb983ff0f50413c649c8fc1d0 diff --git a/app-office/joplin-desktop/joplin-desktop-3.2.3.ebuild b/app-office/joplin-desktop/joplin-desktop-3.3.2.ebuild index 6f4459af8db1..e512dc366a9a 100644 --- a/app-office/joplin-desktop/joplin-desktop-3.2.3.ebuild +++ b/app-office/joplin-desktop/joplin-desktop-3.3.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/laurent22/joplin/releases/download/v${PV}/${APPIMAGE LICENSE="AGPL-3+" SLOT="0" -KEYWORDS="-* amd64" +KEYWORDS="-* ~amd64" RESTRICT="bindist" RDEPEND=" @@ -83,13 +83,12 @@ src_install() { doins -r ./usr/share/icons local apphome="/opt/${PN}" - local toremove=( + local -a toremove=( .DirIcon - @joplinapp-desktop.desktop - @joplinapp-desktop.png AppRun LICENSE.electron.txt LICENSES.chromium.html + joplin.png resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm resources/app.asar.unpacked/node_modules/7zip-bin-linux/arm64 resources/app.asar.unpacked/node_modules/node-notifier @@ -100,7 +99,7 @@ src_install() { mkdir -p "${ED}/${apphome}" || die cp -r . "${ED}/${apphome}" || die - dosym -r "${apphome}/@joplinapp-desktop" "/usr/bin/${PN}" - make_desktop_entry "${PN}" Joplin @joplinapp-desktop "Office;" \ + dosym -r "${apphome}/joplin" "/usr/bin/${PN}" + make_desktop_entry "${PN}" Joplin joplin "Office;" \ "StartupWMClass=Joplin\nMimeType=x-scheme-handler/joplin;" } diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest index 952feb02f568..4d23fe68fcf4 100644 --- a/app-office/libreoffice-bin/Manifest +++ b/app-office/libreoffice-bin/Manifest @@ -8,6 +8,6 @@ DIST amd64-bin-libreoffice-java-24.2.7.2.xd3 32326596 BLAKE2B 03c48f8a592fdbfd0c DIST amd64-bin-libreoffice-kde-24.2.7.2.xd3 21800357 BLAKE2B 99880a908e653ea6e97e0d43ca6d1cf2e249358aac733278ed63a870efbe852a299e27318c6dcf83d7415980f79df64f0d6f8a9fbc60f0956c640c2627555eb5 SHA512 6b5bd27e753d097f7c6e362c381400e6ac5175f9466e6cb0c732f67a0abe045324dd3f72649398892375641da1b5638442c246ebd56930c8c7901415ab604352 DIST amd64-bin-libreoffice-kde-java-24.2.7.2.xd3 33602855 BLAKE2B d71000157c30d7f94152e26d46ce6c67a595dcaa92092890aa3ae52206860ec1911fceae15e02045344ff9fc4cb28aaad088a877d7699b341bcc25ef948b519f SHA512 2f28ffb4f2c60875be0fe451a4ac177bb413cdff0806a709b8adb5f24e4f4bff4d22a9818d27a297bf8f9674313dbc984b0d8ade364351ca4dc06121baa01b84 EBUILD libreoffice-bin-24.2.7.2.ebuild 6019 BLAKE2B ec729faa920ceaf8023fc8aff6f720b993b3abd169a1cb78898d70306eb170dbad9203171c353924ccb0e6d19f48508f9b3e65fb65b718b39590711b9a3474c4 SHA512 b5be229047a96121ec6f67716eee58ce07a98e5be5bfb567b845b5eb4bbe286141e760a0d3d8cd5d72bba943a1c76eb535c5a29e62055cf2c7c0f1840cac1d5a -EBUILD libreoffice-bin-24.8.4.ebuild 3154 BLAKE2B 57a67a8fbcc71b6ed8c286060d92000bbd493bd4d1bda78ce39af81d062e14bb767dd0c91915d1ec8ed27ca6aa95c50979cfdfcec57455673cd257c4b625ac21 SHA512 08e237767726d7dff9ce68bf0b0f9ae8bec176cab62dc54c684a181686d19db0766804a29e535148ef632c788165a6009b7bf3104af124424df6cdc950b0b672 +EBUILD libreoffice-bin-24.8.4.ebuild 3153 BLAKE2B cafa53550315a561ce141f6a5a86c4c19b62500484f1cf9897e6847d20870bfa13c69d693ad3123bc5318d0b40e4c0470e2e9faf689c61d2da82d149e45c0d04 SHA512 bf66e23d580f5fcbd8bf31349dff1eb2cd4f17060569bc6fea9726c53498df6bdc52155fe84c9b4ad1dbee5e012ea8040567a2a74478916eb33dd64585857616 EBUILD libreoffice-bin-25.2.0.ebuild 3154 BLAKE2B 57a67a8fbcc71b6ed8c286060d92000bbd493bd4d1bda78ce39af81d062e14bb767dd0c91915d1ec8ed27ca6aa95c50979cfdfcec57455673cd257c4b625ac21 SHA512 08e237767726d7dff9ce68bf0b0f9ae8bec176cab62dc54c684a181686d19db0766804a29e535148ef632c788165a6009b7bf3104af124424df6cdc950b0b672 MISC metadata.xml 529 BLAKE2B a789c063d4ee905fd36dd0192d0f2769e0eeff96e69b9f27a2e75ca47a7bcb0ec841e68cd0d5299152df2b9b626bcf301066aa251e1b4ca2b74290d57c448c8e SHA512 b98d77cf995e824efcc392c185e616219d35976f43c343a1cfb1737fb44556edbd47b13d47924e3195159d0ec06e40f4909d0e7cd9deed7a8fa10928bc47becf diff --git a/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild b/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild index 2062dcebf6ff..c00524f9eb95 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-24.8.4.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="-* ~amd64" +KEYWORDS="-* amd64" IUSE="java gnome python" RDEPEND=" diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 914bba925d47..0636be8928db 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -2,8 +2,6 @@ AUX libreoffice-24.2-qtdetect.patch 989 BLAKE2B 01e1c1493293363206cd43ded09b69be AUX libreoffice-24.2-unused-qt6network.patch 3348 BLAKE2B 9ec1c83e9405128fcf493e6382e822cb577548e68ec46d0971825dec08cefe7ab18fdaf5d028ce747aaec5cdb57f3d2267b96cff997d90990435cda3ae98d47f SHA512 2eb04c76377526c67e28d20bfcdc682a52c7afa754a2e5a0f6df146917050dd9565bd4ae767347db58bb95afa5436baceea33b3e9b1e6c5b96517eb4cf22e1cb AUX libreoffice-24.2.7.2-no-std-basic_string-int.patch 5372 BLAKE2B 2ec346b903738cd27ff1207d71b57ffcc48891d80dd7c6ef8f38d35516619569b59849ef4065aeb9a976af9929e47366ffa90d1fa50abc195f6c16785790c7b6 SHA512 d0533ec22550cb69a4536edaed71243c294babbc032f4f3ba616aa7d600f372d103559cb50e90429a584c6375a771d15a5485d4f170ce869e4bd0c8621341321 AUX libreoffice-24.2.7.2-poppler-24.12.patch 1644 BLAKE2B 16aa7985a89bdc91875337127d4bda81377f05f10f3e476ab02d30f55e9ae8de679682e302313811379be66f72a8d509ee205fc694eda40979fd4a34ac481ef3 SHA512 9b845747e9fc6547a2a2af1a94a3ca81f18d569bc01e565d25c30bba9a2de4e972cfd67f5c3b45dc9801137d1d99d381a675db9d81932953fcbeb52f73d4ef12 -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-25.2-cflags.patch 5975 BLAKE2B 45cf03f511ca9f559af3593157ab56b4b39c158f03fda2a26b189d2bd43efd0c5cf6734862cd3c7b6f437b92159d280cd569e3249c45d907dda9e8fb0d2671c7 SHA512 1b670ab14431b1945807213ff8e059c321ac2f96308889adac355a1c0578e34652e76e6b0019b59aa834dd34b8d1858d04341fdc006dbae4ce8c22dc2a4e78a8 AUX libreoffice-25.2-unused-qt6network.patch 2315 BLAKE2B 4e73a0da320ceed9c87f8e3c0a39031552ba16f78bf8440f1f7d5ba8e0e048208e51eae68e384bcf46c1a45a91ae5cd6b1ab956214f00393832846832281e30e SHA512 29bf3c4c3ccf89d4578ca31a03228c9cf9c87d82f89c94637a7d904eee4617241d5e0f1668dc4927e47d1c6eb787fbfcc5993dab3766d358deff0cbc4529726e AUX libreoffice-6.1-nomancompress.patch 967 BLAKE2B e60afbfd7007a5fab7291ffba34369137336327f4d1ee27789c5f6229b9a82f4aeab0eaeaf494e60b992c66fcdb276b6423b87713febb14e9eeaffa388369ca8 SHA512 f82e23f15cefd947af20a50e1e4168c9023d5f8b9e19da7f76b141a60be4fa3516ad16400ce26e4d0ff293c570031ac87bbbf6766444e1b31e7bc3ee8ef58083 diff --git a/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch b/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch deleted file mode 100644 index 6aeb3e9e9dac..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.8-unused-qt5network.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 deleted file mode 100644 index 6006d28686d0..000000000000 --- a/app-office/libreoffice/files/libreoffice-24.8-unused-qt6network.patch +++ /dev/null @@ -1,57 +0,0 @@ -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 - |