diff options
Diffstat (limited to 'kde-apps/spectacle')
| -rw-r--r-- | kde-apps/spectacle/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch | 30 | ||||
| -rw-r--r-- | kde-apps/spectacle/spectacle-24.05.2.ebuild (renamed from kde-apps/spectacle/spectacle-24.05.1.ebuild) | 11 |
3 files changed, 37 insertions, 9 deletions
diff --git a/kde-apps/spectacle/Manifest b/kde-apps/spectacle/Manifest index f42ac6263ef6..06142b33ed7e 100644 --- a/kde-apps/spectacle/Manifest +++ b/kde-apps/spectacle/Manifest @@ -1,5 +1,6 @@ +AUX spectacle-24.05.2-gcc12.patch 1228 BLAKE2B 92c8c96b8f10450fd62a9e3885e99a0bccb9bef81ac2c6bcd506cd27f1c7edcca729b4242d5e15db99b2df35ac438ba9e8f5d89d442bb68115ec0936ee7532d7 SHA512 dee068a6a1b121a6aa489a5fa58f7aa7bd4970cf6bc83f040435d62eec4462be3f29018dfa86f532bcb2f5d891abb017045c79377823c984c04a19ea08ca34dc DIST spectacle-23.08.5.tar.xz 1353080 BLAKE2B 22679e37ae3cdcd526853f91e4f427a6b24c8b366c80533a2fe4c727896a52ab25a6055f0d931cab2365cd40f5eb2ccf3bba3bb60e8319902dc1dd83d1d5ccf4 SHA512 4dce51d1932104c7f52cd7f0f306065f0d9bb7a57dc79603850ad6f9283729698324ee358c68f63b9ed306b19ca016a291a0d13e8053a14493283884e9c2c505 -DIST spectacle-24.05.1.tar.xz 1355940 BLAKE2B 5c5526ad20602e9419015a7ffbba125fc038fcb781eab3ca0d257bde6183d908e5e917a2aeb50a344d83c0a993ffc881edc8d8d4494fd175731fce3211a61e0e SHA512 ce289bd00f21548038b40f99a5fb7c51976f65e00dff47f9a532b1979b24b898c202aa969d7a7b177f7a579d6554a0549eb3d7702baa818237b5640c0172b713 +DIST spectacle-24.05.2.tar.xz 1357104 BLAKE2B cfb7028e610e5fb4243de487d3b29df38c56157056cda073eee099f14ce9f94d58b512782f22dc24b2bede903271c63edc31bdd8cbf1767f63ab6cf970760205 SHA512 e6f868857d5518180c617fcc9139f4ac04f8d9811536c444cd28ffccf8baf22599f3d74a4f2dc410a761fbb759d1cc2f57beff33220313750a90e7b940ffdbf1 EBUILD spectacle-23.08.5.ebuild 1854 BLAKE2B 98fb8ae3168271a1f6ebf377ebc09555021a97eb320c00a7a3ecfa415d86c4b72b7380a5a848c5d1bedb98379aa82a2ee2f5fc979cdb217f1a48f4a15ae4d312 SHA512 8949e7a913db3b1c850b8877552af4acf7a91dd42588aaecf708a45653a146d4da05e1c55dd7b2c007dcbc1ef3dfe83699a56f432e9571abb25f7069844ba9ab -EBUILD spectacle-24.05.1.ebuild 1861 BLAKE2B 0f9a3dc5f142099f5200951e34f04c9aec43412a85a98a52af272a850d96f098eafe32b9a6cfb44ef62bf777bf7f9795d0fbc0dc348158ae691086ab7c9cd76a SHA512 2a96e90f284cc832660305f1262b1cd4dbcc37e1ef8974057e1af79b89d0861309603c6b519a3598fc2ed6b33ac452eb75ecae4bf8d6ae39810e22ba0167d004 +EBUILD spectacle-24.05.2.ebuild 1836 BLAKE2B d6af91ad7fb0c4a27d2292fbd2ac6752800b77ae51345d411827b6ac71f0e794252c8953487e5b11844196a8281e43ac1015508b6cf0eb994c4e01832f93c535 SHA512 21e5acdae4add47d2994e9cb1c79328be8808f88f0f5affa11e90a23b074df34e5cc803c30cb03b3263b90d340438720a124d40bb01f5c93c91b39e12db7f405 MISC metadata.xml 433 BLAKE2B aa15f0a819a00c6b039f74d707659bf6beb6ee9c2ac9cd5a1c69163cd684c46d928105e832d93ac8096f128cb479bc30a85866979773cefc5a800ade4a7fd254 SHA512 2df906f333d8f522e66d7977570f8fd35efd329fb797cc4998a9eadfb7405748207f895e8b741004fdcde5dddff58a746337a33edbb7e4a748106fcf366675b0 diff --git a/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch b/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch new file mode 100644 index 000000000000..e60de2c07123 --- /dev/null +++ b/kde-apps/spectacle/files/spectacle-24.05.2-gcc12.patch @@ -0,0 +1,30 @@ +Allow building with GCC 12 +https://invent.kde.org/graphics/spectacle/-/merge_requests/383 + +--- a/src/Gui/Annotations/AnnotationDocument.cpp ++++ b/src/Gui/Annotations/AnnotationDocument.cpp +@@ -16,6 +16,7 @@ + #include <QQuickWindow> + #include <QScreen> + #include <memory> ++#include <source_location> + + using G = Geometry; + +@@ -73,12 +74,12 @@ + { + // Don't allow an invalid canvas rect or device pixel ratio. + if (rect.isEmpty()) { +- Log::warning() << std::format("`{}`:\n\t`rect` is empty. This should not happen.", +- std::source_location::current().function_name()); ++ Log::warning() << '`' << std::source_location::current().function_name() ++ << "`:\n\t`rect` is empty. This should not happen."; + return; + } else if (dpr <= 0) { +- Log::warning() << std::format("`{}`:\n\t`dpr` <= 0. This should not happen.", +- std::source_location::current().function_name()); ++ Log::warning() << '`' << std::source_location::current().function_name() ++ << "`:\n\t`dpr` <= 0. This should not happen."; + return; + } + const bool posChanged = m_canvasRect.topLeft() != rect.topLeft(); diff --git a/kde-apps/spectacle/spectacle-24.05.1.ebuild b/kde-apps/spectacle/spectacle-24.05.2.ebuild index 8ae412e211a9..a4bedd7409c2 100644 --- a/kde-apps/spectacle/spectacle-24.05.1.ebuild +++ b/kde-apps/spectacle/spectacle-24.05.2.ebuild @@ -5,18 +5,17 @@ EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="forceoptional" -KDE_GCC_MINIMAL=13 PVCUT=$(ver_cut 1-3) KFMIN=6.3.0 QTMIN=6.6.2 -inherit ecm flag-o-matic gear.kde.org +inherit ecm gear.kde.org DESCRIPTION="Screenshot capture utility" HOMEPAGE="https://apps.kde.org/spectacle/" LICENSE="LGPL-2+ handbook? ( FDL-1.3 )" SLOT="6" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="share" # slot op: Uses Qt::GuiPrivate for qtx11extras_p.h @@ -62,11 +61,9 @@ BDEPEND=" dev-util/wayland-scanner " -src_configure() { - # bug #932501 - filter-lto - append-flags -fno-strict-aliasing +PATCHES=( "${FILESDIR}"/${P}-gcc12.patch ) +src_configure() { local mycmakeargs=( $(cmake_use_find_package share KF6Purpose) ) |