From 8b4349b75818953123e2d4b80963181a9640c8e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 11 Mar 2024 12:45:52 +0000 Subject: gentoo auto-resync : 11:03:2024 - 12:45:51 --- kde-frameworks/Manifest.gz | Bin 13902 -> 13903 bytes kde-frameworks/knewstuff/Manifest | 3 +- .../files/knewstuff-6.0.0-fix-kdebug-482349.patch | 42 ++++++++++ kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild | 42 ++++++++++ kde-frameworks/knewstuff/knewstuff-6.0.0.ebuild | 40 ---------- kde-frameworks/syntax-highlighting/Manifest | 3 +- .../syntax-highlighting-5.115.0-fix-tests.patch | 85 +++++++++++++++++++++ .../syntax-highlighting-5.115.0-r1.ebuild | 28 +++++++ .../syntax-highlighting-5.115.0.ebuild | 26 ------- 9 files changed, 201 insertions(+), 68 deletions(-) create mode 100644 kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch create mode 100644 kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild delete mode 100644 kde-frameworks/knewstuff/knewstuff-6.0.0.ebuild create mode 100644 kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch create mode 100644 kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild delete mode 100644 kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild (limited to 'kde-frameworks') diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz index ff77e9e4474b..860fb8276e0f 100644 Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest index 0c5047e60be9..754b3394d4c3 100644 --- a/kde-frameworks/knewstuff/Manifest +++ b/kde-frameworks/knewstuff/Manifest @@ -1,5 +1,6 @@ +AUX knewstuff-6.0.0-fix-kdebug-482349.patch 2256 BLAKE2B 3f37cb8d8ce60ca7ab2bb1837cb49108f82446f5764e06ec865069751edb4d1691781402744bb0bf52769a4ea58134f5df7f80f0874a77463ffc857cd78e2898 SHA512 5863dd22e9507798b6c4fdc2f2dc7b217cd449f0fe6253a2aac57726c82b04c28b49b82c325060d64e460b77fc59c95971b91922c946b9262dac660fe314cfdf DIST knewstuff-5.115.0.tar.xz 3389164 BLAKE2B 663e8695f6f5b2f470926737d36fd2117d19661bfcd4e46e2b7a9ea22a2da1b9ddeb7e15d323d13dd1fe2e37ca8bc81f57782d0c9f8fafe4c145752cf34e7182 SHA512 32b9d833d20932b7d6b20cc77812db1a3b01db4e581600c145dafc24becf27b7b72efb4c5f20a1b83b598346696198378095bc28efbfaa24f9944a62d5be29e4 DIST knewstuff-6.0.0.tar.xz 3099232 BLAKE2B 2b6409c625c31895c998acc56146aa9d4ccdb348d85899d26b00795931ee5efc577b36eaf4429892ed7b06e086815877c558780e89f89d1831bb817fd9559621 SHA512 b74bf694ba919553d9e1cc47c97bdebda939c04f700b953901298967ff817a1784698aee23a9e95bd86db7e368dc4246c74ceef86a8d867bbf271d5177c5af48 EBUILD knewstuff-5.115.0.ebuild 1271 BLAKE2B 149ca7ffbd932e72ac0a57b6c6a32bf24b3fe0691ed40089490fba823fd06871e8e06323e72292f48db492611947cd8ad39f85456f806c599aca6ac2e6ae611a SHA512 79c8a10fa091031f4c174688c6684d66612d9aa528b64ba3a8f621f84f2627f04832f5266fa844c162fb86fb14c04e0aef0331cd25bb5f20d73a69d6963ba4da -EBUILD knewstuff-6.0.0.ebuild 951 BLAKE2B 2d4e381866da5b545d3ae057b6cfe173794cf2ab25ed1a856912b50d4b0ff685f8129aec7737127e580c2860e8a49773d447fa90d4b3c10249300a469f4655e8 SHA512 d5d2b21d0b793bcd7a340752593acd0c49c5aae4e7833327a2ac9592e82dfb068713c6e42cdf457a561406e61ab4b025094239739385a21eee3cac0e371e7ea6 +EBUILD knewstuff-6.0.0-r1.ebuild 1007 BLAKE2B 7f2d425a6f5cd33335a9663f27875cc7d0dccceb6fc90dd297bca918dd934a243f95e122698fe59841f32d7f787c3275b1b9ffe98884ac5e07e6399ed33ca99d SHA512 4c308b4ba87780829bc4c966f1a89192c4b8c44d9847d5fd12c19d9adb5ae32b4c87dc1410b826388ce4320db0df10722a5a9a7e1c5b560d0cdb678a3992e5c0 MISC metadata.xml 676 BLAKE2B 708e2ec870917092478d1d1c3154f7c2d412876ed2f1863c367a627c368e74e1302c5581be2ee3a147a577e0960ab4ce88d334fb0c19addcb502e71013e3c1b1 SHA512 44b7adbb024316af56842afd8d33b36b680fd0b8d64c7f8046fd90f3d0c4a21a1e7f99c598ad05a185106b52b15c39467e1066aa4c593bde0ba06a23d8ab235a diff --git a/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch b/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch new file mode 100644 index 000000000000..6e0b2ca3c025 --- /dev/null +++ b/kde-frameworks/knewstuff/files/knewstuff-6.0.0-fix-kdebug-482349.patch @@ -0,0 +1,42 @@ +From 49f2037ac22fcb430fadd5d7b29bd8af234573a4 Mon Sep 17 00:00:00 2001 +From: Akseli Lahtinen +Date: Thu, 7 Mar 2024 16:01:44 +0000 +Subject: [PATCH] Fix link list dialog for installation button + +In gridview, installation buttons showed "Install..." for every item, +even if the item had only single download link. This fixes it +by showing correct button. + +The problem was using `entry` directly instead of `model`. + +BUG: 482349 +FIXED-IN: 6.1 +--- + .../qml/private/entrygriddelegates/TileDelegate.qml | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml +index 2fdee68b4..36224abe2 100644 +--- a/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml ++++ b/src/qtquick/qml/private/entrygriddelegates/TileDelegate.qml +@@ -40,13 +40,13 @@ Private.GridTileDelegate { + visible: enabled + }, + Kirigami.Action { +- text: entry.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…"); ++ text: model.downloadLinks.length === 1 ? i18ndc("knewstuff6", "Request installation of this item, available when there is exactly one downloadable item", "Install") : i18ndc("knewstuff6", "Show installation options, where there is more than one downloadable item", "Install…"); + icon.name: "install" + onTriggered: { +- if (entry.downloadLinks.length === 1) { +- newStuffEngine.install(entry.entry, NewStuff.ItemsModel.FirstLinkId); ++ if (model.downloadLinks.length === 1) { ++ newStuffEngine.install(entry, NewStuff.ItemsModel.FirstLinkId); + } else { +- downloadItemsSheet.downloadLinks = entry.downloadLinks; ++ downloadItemsSheet.downloadLinks = model.downloadLinks; + downloadItemsSheet.entry = entry; + downloadItemsSheet.open(); + } +-- +GitLab + diff --git a/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild b/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild new file mode 100644 index 000000000000..7b9468264281 --- /dev/null +++ b/kde-frameworks/knewstuff/knewstuff-6.0.0-r1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="false" +PVCUT=$(ver_cut 1-2) +QTMIN=6.6.2 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for downloading and sharing additional application data" + +LICENSE="LGPL-2+" +KEYWORDS="~amd64" +IUSE="opds" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + =kde-frameworks/attica-${PVCUT}*:6 + =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kpackage-${PVCUT}*:6 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${PVCUT}:6 +" + +PATCHES=( "${FILESDIR}/${P}-fix-kdebug-482349.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package opds KF6Syndication) + ) + + ecm_src_configure +} diff --git a/kde-frameworks/knewstuff/knewstuff-6.0.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.0.0.ebuild deleted file mode 100644 index 8c48819cbbc5..000000000000 --- a/kde-frameworks/knewstuff/knewstuff-6.0.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="false" -PVCUT=$(ver_cut 1-2) -QTMIN=6.6.2 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for downloading and sharing additional application data" - -LICENSE="LGPL-2+" -KEYWORDS="~amd64" -IUSE="opds" - -DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - =kde-frameworks/attica-${PVCUT}*:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kpackage-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) -" -RDEPEND="${DEPEND} - >=kde-frameworks/kirigami-${PVCUT}:6 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package opds KF6Syndication) - ) - - ecm_src_configure -} diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest index 8ba9840a1756..68b7fa776185 100644 --- a/kde-frameworks/syntax-highlighting/Manifest +++ b/kde-frameworks/syntax-highlighting/Manifest @@ -1,5 +1,6 @@ +AUX syntax-highlighting-5.115.0-fix-tests.patch 6566 BLAKE2B bc058bc6ff12c7820abf9eb6a3cd0f5d441a7ae5973a7d521e1a8091fd769d8c65ef0eb79fa283c31774170d487d97fbde25d4775c4d2ef9c5bdff0b103cd910 SHA512 0663640b91a5770dbf5bf2b083d72102af6019f471f0bdc84e19c71b13424cf12b83188dacbe4d9fb34398461f4a9f00a319f1125321974ca213dd422a9ae0e3 DIST syntax-highlighting-5.115.0.tar.xz 3432708 BLAKE2B 3ecfda27588509e5b791f3a78806c6fc3d898807157edef9e574c73f26069b1d92093d8c760da785cc9d769504a13f261c340fa4829857f37e158ade81a96dee SHA512 6a25a6c3be6258e956663065864ec177d05d91c817e79922ba599e45d4738813746a7c751c5043135d2c7255d341a60a6152e1d02ad90136e00a97ecb2ecd479 DIST syntax-highlighting-6.0.0.tar.xz 3527420 BLAKE2B 85ec002cd204c78f9ae97f75846211a40b32fafbc8683736b55f2bbfd559bff4d312c21c82a354670dd83457257500389912b94844e8800303c5430705916a01 SHA512 864117cbf00599276fbb7b7efe7419379b7b1448b966a2d9108a0ea2646ce64626fba10f43a14a16a34076347143311a699aea797d88bd91a4be636c330cbcfa -EBUILD syntax-highlighting-5.115.0.ebuild 531 BLAKE2B 8074e3125c0c96496ed46b1498a86a55792fbfb0b07bb83652d478a6219a6dc03fa36e7b16fe8028463ec49f749dcba844bfb4ce04932a2a36a01168e74f621f SHA512 393a18ee6cb0e612700be94e50e19d900969ab79231afa058f3250b6f2e2ae06c419b7adef596c4aeec752dc54574a2faa307767944ef93e81696cd4f683cf77 +EBUILD syntax-highlighting-5.115.0-r1.ebuild 592 BLAKE2B b1bc3ae5b2a835a234304c5e930125b71e53f692375f32916aae56df6f7bcc0566455a9c41032be4bf65d081b728079411e602fbfb8898fa27563b627d2cdbd0 SHA512 05c9298183aa42f454b15242700a29fe1aa08e9e0fe0c4f55337b7693b0f1bc2d4c62abeaa237f80fed1b4ba30cce4e25f29b2fd03a3817f1d447dccdbca02a0 EBUILD syntax-highlighting-6.0.0.ebuild 514 BLAKE2B da8106c61cff37b1ba3c1e37452c0f17374980e0bbf60495f9e048b88e5f637f1eeffed849b7a18bebdf2662f33ab07b9e175c9aba9f66442e966709fe9468af SHA512 22b92adc36761ce83221c8ba35549045c71bda420318122dfcd2a43cbd1f7d58ef24256abfd33f039cb0c41641c7dce165e9961fbf342e8a451e8334cd16d3e8 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch new file mode 100644 index 000000000000..8ab49e752f2a --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch @@ -0,0 +1,85 @@ +From aaede4eff4f9aa160be767c7b1aee0cf27cbb0e8 Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann +Date: Sun, 3 Mar 2024 18:01:38 +0100 +Subject: [PATCH] use (?:sub){0,2} to work with all pcre versions + +--- + autotests/html/highlight.ly.dark.html | 2 +- + autotests/html/highlight.ly.html | 2 +- + autotests/reference/highlight.ly.ref | 2 +- + data/syntax/lilypond.xml | 6 +++--- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/autotests/html/highlight.ly.dark.html b/autotests/html/highlight.ly.dark.html +index 8a8466174..441a16839 100644 +--- a/autotests/html/highlight.ly.dark.html ++++ b/autotests/html/highlight.ly.dark.html +@@ -15,7 +15,7 @@ + %} + + \header { +- title = "Katepart Lilypond syntax highlighting test file" ++ title = "Katepart Lilypond syntax highlighting test file" + composer = %{"Wilbert Berendsen"%} "Anonymus" + poet = "The KDE team" + opus = "1" +diff --git a/autotests/html/highlight.ly.html b/autotests/html/highlight.ly.html +index 8bc714646..1081ed38c 100644 +--- a/autotests/html/highlight.ly.html ++++ b/autotests/html/highlight.ly.html +@@ -15,7 +15,7 @@ + %} + + \header { +- title = "Katepart Lilypond syntax highlighting test file" ++ title = "Katepart Lilypond syntax highlighting test file" + composer = %{"Wilbert Berendsen"%} "Anonymus" + poet = "The KDE team" + opus = "1" +diff --git a/autotests/reference/highlight.ly.ref b/autotests/reference/highlight.ly.ref +index f11654d43..9b7afdb3c 100644 +--- a/autotests/reference/highlight.ly.ref ++++ b/autotests/reference/highlight.ly.ref +@@ -9,7 +9,7 @@ + %}
+
+ \header {
+- title = "Katepart Lilypond syntax highlighting test file"
++ title = "Katepart Lilypond syntax highlighting test file"
+ composer = %{"Wilbert Berendsen"%} "Anonymus"
+ poet = "The KDE team"
+ opus = "1"
+diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml +index 58a4459db..1894d4063 100644 +--- a/data/syntax/lilypond.xml ++++ b/data/syntax/lilypond.xml +@@ -23,7 +23,7 @@ + + + +- ++ + + + +@@ -56,7 +56,7 @@ + ]> + +@@ -1076,7 +1076,7 @@ + + + +- ++ + + + +-- +GitLab + diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild new file mode 100644 index 000000000000..93a2dfd1f115 --- /dev/null +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Framework for syntax highlighting" + +LICENSE="MIT" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 +" +DEPEND="${RDEPEND} + >=dev-qt/qtxmlpatterns-${QTMIN}:5" +BDEPEND=" + dev-lang/perl + >=dev-qt/linguist-tools-${QTMIN}:5 +" + +PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) # bug 924756 diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild deleted file mode 100644 index 76cb7343b311..000000000000 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -QTMIN=5.15.9 -inherit ecm frameworks.kde.org - -DESCRIPTION="Framework for syntax highlighting" - -LICENSE="MIT" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 -" -DEPEND="${RDEPEND} - >=dev-qt/qtxmlpatterns-${QTMIN}:5" -BDEPEND=" - dev-lang/perl - >=dev-qt/linguist-tools-${QTMIN}:5 -" -- cgit v1.2.3