diff options
author | V3n3RiX <venerix@koprulu.sector> | 2025-02-24 19:24:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-24 19:24:56 +0000 |
commit | d4653056cc74d97f24bef0d56b4ebe11c53c8b76 (patch) | |
tree | 5d4be0715302fad2089468027fadaa0372afd1d1 /kde-apps | |
parent | 575bcb9220287a6f0d2577db1fd9fe55d9d8b745 (diff) |
gentoo auto-resync : 24:02:2025 - 19:24:56
Diffstat (limited to 'kde-apps')
-rw-r--r-- | kde-apps/Manifest.gz | bin | 36048 -> 36044 bytes | |||
-rw-r--r-- | kde-apps/kmix/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch | 94 | ||||
-rw-r--r-- | kde-apps/libkdcraw/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/libkdcraw/libkdcraw-23.08.5.ebuild | 4 | ||||
-rw-r--r-- | kde-apps/libkexiv2/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/libkexiv2/libkexiv2-23.08.5.ebuild | 4 | ||||
-rw-r--r-- | kde-apps/marble/Manifest | 2 | ||||
-rw-r--r-- | kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch | 29 | ||||
-rw-r--r-- | kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch | 69 | ||||
-rw-r--r-- | kde-apps/step/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/step/files/step-24.12.0-qalculate.patch | 37 |
12 files changed, 6 insertions, 239 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz Binary files differindex cd7748e4b324..1c47499dec27 100644 --- a/kde-apps/Manifest.gz +++ b/kde-apps/Manifest.gz diff --git a/kde-apps/kmix/Manifest b/kde-apps/kmix/Manifest index b32cab97ba02..343c94b57597 100644 --- a/kde-apps/kmix/Manifest +++ b/kde-apps/kmix/Manifest @@ -1,5 +1,4 @@ AUX kmix-23.04.2-autostart_disable.patch 1151 BLAKE2B 9f9609a39f66e97d7a6427fae6aaf14c0f65755b05ddfe55d05ad49f42463960d4e9a9f97eae9a38311174b376c8e182336ec4bed793f36a02cd2aa71bda3d42 SHA512 5d1ded259efc871d4b4d9b6fd43aff29970f9c04579cdd1419563a08761cb4fbb9d16642cb648d547aeec7c53b26976d49e30e2e0c8cae23b3bb2d7ba1fa6b9b -AUX kmix-24.05.2-revert-kcm_pulseaudio-dep.patch 3237 BLAKE2B 5587e62301a0f4c9ee70ed227472ef12cbfd8a6fbaf9446c312131ed7cd51434c641b872ef8aba0ce71b0300a2040e93cbb19674003d684405e747218dc5cbb7 SHA512 f9bb9a81269ab42b89bd3599ee14df4cb5ef6f645aae6039e3f25107ce0eb57c53b74049d52613bb2a52e3552b23fc300b73e5d07dadbea4652af1bdc99cd8fe DIST kmix-24.12.1.tar.xz 1167696 BLAKE2B 632818aa612bcbebcefea0e772eaee42e807495befcddf6a2bc1013341e61dc53c699daa8ebd83def1bc834259fd021092f0cb63f28a59ef192f33a5366e465c SHA512 fc089dc3afeb5a80b2742dba2f3e46bdc2c63c0e9393adac10854107492d34ddbc86d3ba02fcda6e0cc06494631afa8c05ce1800c17d797c0936823374310e69 DIST kmix-24.12.2.tar.xz 1167820 BLAKE2B 2a9a01fee22f0990b4f541cac292b01c813dcafc8ba281bb4cc8542ac6625a484e652f85a655be1b49493233272481ef8d8bf5eb444299c72ae682529f08ddd2 SHA512 c84550640e4ed2ff621780b8e50ba40ca4f31b4837552905f0a1e7792672997978b298142df092c3112d513652719086a9be424499730bcd5e038495708b1ffc EBUILD kmix-24.12.1.ebuild 2166 BLAKE2B ac35dd476023b8c55469e3fc90eedf08bd6797eb0ade0d3723d667971ca77ad26fa2b6404c6e4cdbaacf9f08b3f1e88c27d2710000abfde2c810a1a5ef08b400 SHA512 6c6beda8e8d93bfc1206ea29a803fec1ddccef14b57a62cb4463b4239136bf4de830c0bbed0c3b30ba84084f05266679cc6cf67bf7858698000388ac76a75f42 diff --git a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch b/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch deleted file mode 100644 index 23987a8261db..000000000000 --- a/kde-apps/kmix/files/kmix-24.05.2-revert-kcm_pulseaudio-dep.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 8d6837131706bd0f5dbd573726e7c01775f8256c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 4 Sep 2024 08:03:09 +0200 -Subject: [PATCH] Revert "When we click on "Audio Setup", calls kcm_pulseaudio" - -This reverts commit a54f760987557036b90888a3efa7ad17346a00ed. ---- - apps/kmixwindow.cpp | 22 +--------------------- - apps/kmixwindow.h | 2 -- - desktop/kmixui.rc | 1 - - 3 files changed, 1 insertion(+), 24 deletions(-) - -diff --git a/apps/kmixwindow.cpp b/apps/kmixwindow.cpp -index fa727f39..fb182f49 100644 ---- a/apps/kmixwindow.cpp -+++ b/apps/kmixwindow.cpp -@@ -37,7 +37,6 @@ - #include <klocalizedstring.h> - #include <kstandardaction.h> - #include <kxmlguifactory.h> --#include <KProcess> - - // KMix - #include "kmix_debug.h" -@@ -164,11 +163,7 @@ void KMixWindow::initActions() - - KStandardAction::keyBindings(guiFactory(), &KXMLGUIFactory::showConfigureShortcutsDialog, actionCollection()); - -- QAction* action = actionCollection()->addAction(QStringLiteral("launch_kdesoundsetup")); -- action->setText(i18n("Audio Setup...")); -- connect(action, SIGNAL(triggered(bool)), SLOT(slotKdeAudioSetupExec())); -- -- action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow")); -+ QAction* action = actionCollection()->addAction(QStringLiteral("hide_kmixwindow")); - action->setText(i18n("Hide Mixer Window")); - connect(action, SIGNAL(triggered(bool)), SLOT(hideOrClose())); - actionCollection()->setDefaultShortcut(action, Qt::Key_Escape); -@@ -1174,21 +1169,6 @@ void KMixWindow::toggleMenuBar() - menuBar()->setVisible(_actionShowMenubar->isChecked()); - } - --void KMixWindow::slotKdeAudioSetupExec() --{ -- forkExec(QStringList() << "kcmshell5" << "kcm_pulseaudio"); --} -- --void KMixWindow::forkExec(const QStringList& args) --{ -- int pid = KProcess::startDetached(args); -- if (pid == 0) -- { -- KMessageBox::error(this, i18n("The helper application is either not installed or not working.\n\n%1", -- args.join(QLatin1String(" ")))); -- } --} -- - void KMixWindow::slotConfigureCurrentView() - { - KMixerWidget *mw = qobject_cast<KMixerWidget *>(m_wsMixers->currentWidget()); -diff --git a/apps/kmixwindow.h b/apps/kmixwindow.h -index 67560723..0bcb04ed 100644 ---- a/apps/kmixwindow.h -+++ b/apps/kmixwindow.h -@@ -86,7 +86,6 @@ protected Q_SLOTS: - - private: - KMixerWidget* findKMWforTab( const QString& tabId ); -- void forkExec(const QStringList& args); - KToggleAction* _actionShowMenubar; - - bool m_startVisible; -@@ -117,7 +116,6 @@ private: - static QString getKmixctrlRcFilename(const QString &postfix); - - private Q_SLOTS: -- void slotKdeAudioSetupExec(); - void slotConfigureCurrentView(); - - void plugged(const char *driverName, const QString &udi, int dev); -diff --git a/desktop/kmixui.rc b/desktop/kmixui.rc -index 5c53281a..27ca3351 100644 ---- a/desktop/kmixui.rc -+++ b/desktop/kmixui.rc -@@ -16,7 +16,6 @@ - <Menu name="settings"> - <Action name="toggle_channels_currentview" append="save_merge"/> - <Action name="select_master" append="save_merge"/> -- <Action name="launch_kdesoundsetup" append="save_merge"/> - </Menu> - <Menu name="help" append="about_merge"><text>&Help</text> - <Action name="hwinfo"/> --- -2.46.0 - diff --git a/kde-apps/libkdcraw/Manifest b/kde-apps/libkdcraw/Manifest index 29ff5c4e576c..03478032d95f 100644 --- a/kde-apps/libkdcraw/Manifest +++ b/kde-apps/libkdcraw/Manifest @@ -1,7 +1,7 @@ DIST libkdcraw-23.08.5.tar.xz 37500 BLAKE2B 03f192f09485dbdb2361d9553b067211825f3862a07661f3494b03cc12db66823af539ee29f04a2ef2874c61c42c129b5116428b0cfc9994022b0c079ca0ecee SHA512 76b5b5ee83dfb20f5bb857b7b1d654388066da70413f58319d8ba0b143d0ae8bbd1f2a1ff26d205742fe57f7cf76a81687419787498c72a6faa9d21f92836059 DIST libkdcraw-24.08.3.tar.xz 37332 BLAKE2B 1837b940a4ab62485eee8c9deb3063e3410189bff51f1c7c9d38c089a4a2a15dab78b377fb1259d311bd13ea8f953829c6f7a377424e52db37f8cff07737a4f0 SHA512 32b468fb342993385b66de79a7136e3c00575687bd32c0d05962346a32d9799d3d94fd56869aefed3735468e60f5761c3056c5376c375615dc373efefe8ce9cb DIST libkdcraw-24.12.2.tar.xz 37320 BLAKE2B 7de3f11fbbad4f691dcfba73c10f4c05dab0edef8d0d06876de93b829270fa17250f55feaf99ed3a72420aa06e3994b8af08f689409013219af72aa412f6c3c0 SHA512 797cedc1e445b569c8b15c1d7ee1ebcc02ecf40eccc6a1989bcb40c22d6ca64a8576a8d0430791ae8b5abaf854225b3ea6200ceaf0ff011a214d45f6b4e041f0 -EBUILD libkdcraw-23.08.5.ebuild 377 BLAKE2B a61d604524288d73f20b25a70e74edd363dc5594fb0546c7b1aba86d81518fa20b204302a817135b3d5ed293a0d9352ee5590d550e2d15450ff6fc750e956a71 SHA512 3b34bc2a6e2fd694969a76d97c8fcfc1a2bcca96dbb2b4eae2f1f2332b9b0f90d1b48fa3f9cc294e05ef5ce1d9bf767180acbc72ff6e577a2ec75479b4b3344e +EBUILD libkdcraw-23.08.5.ebuild 378 BLAKE2B 0f0998e515103f0863037d994ca42c82eafd68d38a1b57906c5e0dfc08e6d4a17c81b1cf627098fc8266f2661946b1bff4e4d9bd8241882e8ca1e75f1fb3aa27 SHA512 d3c26cb81363c585fa174b873348ba841d66ca031c0271c122d80e3f56d3e978df53a0ae4d7f938ba80bc3fbb835e90be7851a0bb272f67e2fc188fcd171bc3c EBUILD libkdcraw-24.08.3.ebuild 388 BLAKE2B 816f5ec28e49c10fd83dff212798f1f384dea4d9b13d57b4f9bce4f35ddfa14d4704a7c0423eccd94aecded0b17571668429e20b269d92c4a7982dd8ba8a3bb2 SHA512 1e379b8081333667f4b89b535de8e44876b6bdc6880a763b50660021f0a3b3571837d18672ffa1d8a5dc72a8065f696f6da0d417ffdf195d61a1c9506516cda2 EBUILD libkdcraw-24.12.2.ebuild 397 BLAKE2B ec316ee6b2ea529e60068ab0cd3d0e6596f865f21b8ca741726b7985b25c4e817773299ada9016264fe38e80438e179ff453fc6763db74eb4ddf6ae4ef30d529 SHA512 97e7944100a1a14329ee73a1d3584e23c4acf18b56833df825fdf65d6a02cc1e9799d5f46656ff5632bb18cac86ffcbff402c03c71ee2afbbc93685510f9798c MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/libkdcraw/libkdcraw-23.08.5.ebuild b/kde-apps/libkdcraw/libkdcraw-23.08.5.ebuild index 1c1fcb4ac942..a8264d7cdf1c 100644 --- a/kde-apps/libkdcraw/libkdcraw-23.08.5.ebuild +++ b/kde-apps/libkdcraw/libkdcraw-23.08.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ DESCRIPTION="Digital camera raw image library wrapper" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="" DEPEND=" diff --git a/kde-apps/libkexiv2/Manifest b/kde-apps/libkexiv2/Manifest index c06176d03c65..02323a0899e6 100644 --- a/kde-apps/libkexiv2/Manifest +++ b/kde-apps/libkexiv2/Manifest @@ -1,7 +1,7 @@ DIST libkexiv2-23.08.5.tar.xz 60688 BLAKE2B b5b004a1eecd1e24542f41088b9cf04107d11e5cc2f4c80728c6bd1fccc06dee6f83ccf466f8fed7e1037c7f5fcd00eaf6519ed993f18affe77c839de60a9183 SHA512 e6535c24fea7c4a640433f6b1064d2058ba96a5908d08980ff978da8a4eb177aa26dd75a25c8ab44bb619b7a8e7ecfce8670ed3a67812806e9b587aeb48bcd16 DIST libkexiv2-24.08.3.tar.xz 60636 BLAKE2B 67ae214f2f8326cb0ac2db12013a7be4d297e464b3ff9d82c9ae4202f6e983bc7c7058ea05e529da7ec68c016e698ce34b45f55742d6ce7d6e7d374c49853f9e SHA512 98c1cedec7ef26ed05b8b542ff54728155a1d18cb240bdb57001168db83fe6c16d7fdd2e67b305cb0dd64879dc267e0cac4d413f934b4003410b80742cf711e4 DIST libkexiv2-24.12.2.tar.xz 60628 BLAKE2B 0663bc0b8e800875fd7e051aaeb7ef22b9cfface0842823e9f76645fab9a3959d1138b971ac7667d43e1f63dd30ae41b4e5a73709107c89bb5442b90bc44905a SHA512 0ec528df439960354c59438b3e83035332c23e92db8b261fda13d6cb8f0ad2c3a5079d1fdbcf2016e3872fed6adb094da7c509dfde94a8e6f536e938093da80b -EBUILD libkexiv2-23.08.5.ebuild 378 BLAKE2B 9ae8ca266a7892ac9a2d891037e283e8d7a0d3cdf5c531e979d1883709c857ee6a3c2ca5ca4896b2752d8100cdcfd4096b04c8733cfa372bfa22eeb2a09910da SHA512 c2668f702955d5985569260f86b334253b7cd3a11d1dd92e2845cf3b774a3e7460503cafe4d9a83f1b8cdd795094d8a23adf865a2718c568459131f9563bb150 +EBUILD libkexiv2-23.08.5.ebuild 379 BLAKE2B 2a6c2b057fe9a66b53e9e52cc4ea63af3f284e72230afa397c504e3741614113549d6aae2e49f34f63c09fd69db690f974f03f4bd164e32420ff41785f67446c SHA512 5af2c750c6cc9fc8ab7b46dede40b12fc5d8ad5b9739fcfb66b58854a4ae398a35e7a4f113bcfa73112ef7ae1a015d7d5e139d14b274b874eac9565f23f88698 EBUILD libkexiv2-24.08.3.ebuild 384 BLAKE2B c48226f4d259865fc23c5ea8d3b1baa63a355423c2a19956e0acc314699ab127623992c9a2e6968a5095f4f850c724250957ebf0d424ca7c1dfccc34173c78a0 SHA512 6956269987c0ff5288556bc3316dee20bbeba5918424bdab14a2d292f1f349129cb3cf77778da41349768a979aa908b794e779d90fa1f8ddb4f35229ba6560fe EBUILD libkexiv2-24.12.2.ebuild 393 BLAKE2B 6ecc552a76dd0d162025810f25586f614b108f1280cc21bfc75813f411dd6b1aa2ad86e11b292a4095686ed90c3849f9100bb72c97bfef3c0e04a2bedb13ef76 SHA512 6a8859cef796aca3563a5a856ae10ea059a041ebd24e1322cb55503ee136fb464bb68245dcdb0c3e9bc9f415192e4531b52353add8efe9f3326b4ba3c12170a6 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/libkexiv2/libkexiv2-23.08.5.ebuild b/kde-apps/libkexiv2/libkexiv2-23.08.5.ebuild index d1f03d395bb5..36bf0f245e80 100644 --- a/kde-apps/libkexiv2/libkexiv2-23.08.5.ebuild +++ b/kde-apps/libkexiv2/libkexiv2-23.08.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ DESCRIPTION="Wrapper around exiv2 library" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="+xmp" DEPEND=" diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 6b53fff4045d..95b8f7ab37bf 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,3 @@ -AUX marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch 877 BLAKE2B cfd5386a05423f4cd70d246ad9eedbd587e65a9a963edb1220228e38acc39868a6aa7ac95edba353513ef61aa1fd385f0b11a85fa61f5f84a6264aa73a6d2ae1 SHA512 c75bfd78b058d4e85a062673c6f1087135fe06826fb8dd2cb023b5cbe3d8d2cbbb3a144e64c6ba237bab40e7420083e4efac89ee8f2eb0dd49d88e7002725cfc -AUX marble-24.12.0-cmake-drop-qt_policy.patch 2302 BLAKE2B f479e07c8e9340efec34dca67192707afdca2683b2f6646408d25df8e746105bb77f6f0e0fc1634113a95fc396e3e1cc03f4dff5c384c1fb3072f3a360fa2ffb SHA512 28ba6be0484b87e4d4de63e5cba434bb2ff525b84d12a818eeb6a0d140802b146b8a165098817be776f23bcd429d21a14b22b5a4a6222e8e1f48466e64183c4e DIST marble-24.12.1.tar.xz 53605040 BLAKE2B 680f86527cb1bffc4a00a5f472ca87b40a78cd32c4eb29b51e689d9a8900c0355d425b345ce824c88451f89bc81102376b8236b9f8216fbb41212dff6d80da3a SHA512 6a5e8feb8bf2be189aa449f28eca6e7b82638c7343569b208975c418544e4c2bdcb8af317b4b3fd6d5fcc19f8389e56a2f6c33accf6f3bdb41352d0c6cb403f5 DIST marble-24.12.2.tar.xz 53627908 BLAKE2B c9176193337f54876c59a07be810ad7e6946d0df9d38d3e8d6071f98f52ac1874f3078d49bcd26d6b14ca11d52a074dfb63e820b0801f4a153e93e82424b009e SHA512 2406d125e29aa2edf570ed2ff41c3d5dbe14a67970369b0c3ab19a2da3e1b8ae77c3127736bf3bc60f0e6c07759c8e6a408b5e5e3b31891b76eccd020dec9464 EBUILD marble-24.12.1-r1.ebuild 2593 BLAKE2B 7a03ed3dc03a4cf0c874f3308dae970d86eaa6606d080f24b3fc6a4f247f1eca6c809f806c15e9caa3976b0a9294f37cf139f63ba32fcbb3d29bb5709b059bee SHA512 041d159d2f19ba6e5f2ec9fdf8fdfea1222509a6cab82a4f4fcc8e390f4911376dd72094c6cff6d37252ff62a0cdfda83877f5bc56d808ec9c2e07b609bf1cb6 diff --git a/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch b/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch deleted file mode 100644 index 3db739a8c82b..000000000000 --- a/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5a6bf3c71cd017f3e43a74d9ac39efa3921c6d99 Mon Sep 17 00:00:00 2001 -From: Joshua Goins <josh@redstrate.com> -Date: Sat, 14 Dec 2024 20:18:24 -0500 -Subject: [PATCH] Don't build behaim or marble-maps targets in non-KF builds - -These depend on KDE frameworks, so don't try to build them when don't -have them. ---- - src/apps/CMakeLists.txt | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt -index 6f9dc25420..013cd3c52f 100644 ---- a/src/apps/CMakeLists.txt -+++ b/src/apps/CMakeLists.txt -@@ -11,6 +11,8 @@ if(BUILD_MARBLE_APPS) - endif() - endif() - -- add_subdirectory(behaim) -- add_subdirectory(marble-maps) -+ if (TARGET KF6::Config AND TARGET KF6::I18n AND TARGET KF6::CoreAddons) -+ add_subdirectory(behaim) -+ add_subdirectory(marble-maps) -+ endif() - endif() --- -GitLab - diff --git a/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch b/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch deleted file mode 100644 index 71f721043c4d..000000000000 --- a/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 98d2d37dcec8ec8b5b7f4c24c85120ed9468a33a Mon Sep 17 00:00:00 2001 -From: Joshua Goins <josh@redstrate.com> -Date: Sat, 14 Dec 2024 20:08:44 -0500 -Subject: [PATCH] Remove usage of some Qt CMake usage with ECMQmlModule - -We use this, so we don't need to set qt_policy ourselves or -ecm_add_qml_module. Also fixes non-KF6 builds. ---- - CMakeLists.txt | 2 -- - examples/cpp/marbleQuick2/CMakeLists.txt | 2 +- - src/apps/behaim/CMakeLists.txt | 2 +- - src/apps/marble-maps/CMakeLists.txt | 2 +- - 4 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0681500d06..f708cacd52 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,8 +110,6 @@ set_package_properties(KF6 PROPERTIES - TYPE RECOMMENDED - ) - --qt_policy(SET QTP0001 NEW) -- - find_package(Protobuf) - set_package_properties(Protobuf PROPERTIES TYPE OPTIONAL PURPOSE "Parsing of OSM PBF files.") - -diff --git a/examples/cpp/marbleQuick2/CMakeLists.txt b/examples/cpp/marbleQuick2/CMakeLists.txt -index c9c3809e85..493684f409 100644 ---- a/examples/cpp/marbleQuick2/CMakeLists.txt -+++ b/examples/cpp/marbleQuick2/CMakeLists.txt -@@ -5,7 +5,7 @@ add_executable(marbleQuick2 main.cpp) - - target_link_libraries(marbleQuick2 PUBLIC Qt::Quick Qt::Widgets) - --qt_add_qml_module(marbleQuick2 -+ecm_add_qml_module(marbleQuick2 - URI org.kde.marble.quick - QML_FILES - Main.qml -diff --git a/src/apps/behaim/CMakeLists.txt b/src/apps/behaim/CMakeLists.txt -index 8011e0bc52..13219b663a 100644 ---- a/src/apps/behaim/CMakeLists.txt -+++ b/src/apps/behaim/CMakeLists.txt -@@ -19,7 +19,7 @@ if(NOT MARBLE_NO_WEBKITWIDGETS) - add_definitions(-DMARBLE_WEBKITWIDGETS=1) - endif() - --qt_add_qml_module(marble-behaim -+ecm_add_qml_module(marble-behaim - URI org.kde.marble.behaim - QML_FILES - MainScreen.qml -diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt -index 39f9940322..79a4897304 100644 ---- a/src/apps/marble-maps/CMakeLists.txt -+++ b/src/apps/marble-maps/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT ANDROID) - target_link_libraries(marble-maps PUBLIC KF6::Crash) - endif() - --qt_add_qml_module(marble-maps -+ecm_add_qml_module(marble-maps - URI org.kde.marble.maps - QML_FILES - MainScreen.qml --- -GitLab - diff --git a/kde-apps/step/Manifest b/kde-apps/step/Manifest index 8bc7bbf4224f..e4ba0fb58d84 100644 --- a/kde-apps/step/Manifest +++ b/kde-apps/step/Manifest @@ -1,4 +1,3 @@ -AUX step-24.12.0-qalculate.patch 1419 BLAKE2B bd835df15959179e6cba00b7eb28bdb04ba4deb51293a9fff57e710994112ad710aa2b8d2dc5135e6050236138e682626b9432f835b4dc9693443e6745bcccaa SHA512 3d4edb5e6df5cd93790ce5262ddef80b1c7f89fee14082247a8abb5f27b890d2263307b0bdd666b128785b2610647490b85ce01742cf4bf5a2a6748a00340001 DIST step-24.12.1.tar.xz 987780 BLAKE2B ce6d25414008a8f244279960ecd6179738fe76a0865c92ad40cca9399e2ee9ba2a3aeef1b723e4033a55889983ba5b94e39971bdd29c3faf8827e02f7b32776a SHA512 75016486a460afd3201ffe41bc1ce803c175df01c92373a451283fe5cc738978c7a7a742a8b1f67e6d3408c1dc6b9203f7a11743091a56eee5ac6d888f89d65d DIST step-24.12.2.tar.xz 987440 BLAKE2B 67f8346e27bcf3170c0b52c4228d30b5b1f33d9c073c3e111ec0840ef9279b85c8a94b93ce1b27c2b487010431e301f7c89ee581d9e24937a2899a596c387747 SHA512 296b0bbc6a9eb1697a393621ade64e30fe4db569882f012e8a62ea4dcbcdba1483ad8470313e1c15ceac5bf39d9a623117bb224ac429939555fe33e4192fbec6 EBUILD step-24.12.1.ebuild 1338 BLAKE2B 47086a8e2b795b0617a3937b36d5427807d6a2501a4f8e4cf371a64000b7ac103ed2fe8dade360c2945b0bb0fa6b9c475a8c5019e1117e2242a0511fdb6a1bb9 SHA512 cbbb1f0fc51c5c8a07343af469bd032bd7cf03cf7eecb4bb58f81037759874285744083af426faa475dd5cac971e26085f8ca91b5b3a104f84f067f5f3363a09 diff --git a/kde-apps/step/files/step-24.12.0-qalculate.patch b/kde-apps/step/files/step-24.12.0-qalculate.patch deleted file mode 100644 index 55d67d0786a5..000000000000 --- a/kde-apps/step/files/step-24.12.0-qalculate.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 32ef71cac432dd61d7f631e88dece23721a793e9 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <luigi.toscano@tiscali.it> -Date: Sun, 29 Dec 2024 23:49:39 +0100 -Subject: [PATCH] Enable qalculate, which is not a Qt library -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Qalculate has a separate Qt based interface (and a Gtk one) -but the library does not depend on Qt. -Enabling the library allows the program to parse the units -again when setting some values with a unit in the property editor -(for example 32 dm ± 10 cm is converted into 3.2 [m] ± 0.1 [m]). - -(cherry picked from commit bba6986d36f0857463be8bc945951079d300f6ed) ---- - CMakeLists.txt | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76a494c..4c352a5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,10 +73,6 @@ set_package_properties(GSL PROPERTIES - set(STEPCORE_WITH_GSL ${GSL_FOUND} CACHE BOOL "Enable GSL-powered features for StepCore") - set(STEPCORE_WITH_QT ON) # CACHE BOOL "Enable QT-powered features for StepCore") - set(STEP_WITH_QALCULATE ${QALCULATE_FOUND} CACHE BOOL "Enable unit conversion support using libqalculate") --if (QT_MAJOR_VERSION STREQUAL "6") -- MESSAGE(STATUS "QALCULATE was not ported to QT6 yet") -- set(STEP_WITH_QALCULATE false) --endif() - - # Compiler specific options - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") --- -GitLab - |