diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 23021 -> 23023 bytes | |||
-rw-r--r-- | media-video/haruna/Manifest | 5 | ||||
-rw-r--r-- | media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch | 94 | ||||
-rw-r--r-- | media-video/haruna/haruna-1.3.3.ebuild (renamed from media-video/haruna/haruna-1.3.2.ebuild) | 3 |
4 files changed, 2 insertions, 100 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 00366e059d30..5f833dbef21b 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/haruna/Manifest b/media-video/haruna/Manifest index cb224ee69955..3207925ad64b 100644 --- a/media-video/haruna/Manifest +++ b/media-video/haruna/Manifest @@ -1,4 +1,3 @@ -AUX haruna-1.3.2-system-kdsingleapplication.patch 3095 BLAKE2B 598dbb11265ca8651a112bf4f41cb5f653a60661a40fef857af90ef5228184a02be7e0cf580c2e633d51a665fbc68b0e0f5b6e1369c984b58669f9db53d79c88 SHA512 6009e840d292b2cd62640c12fabbf270ceeca9684d29128ba5301681842e10f89526a9a2a55d50490e2aafd24fff0f716094fb6ae053b737cd477a74c426b000 -DIST haruna-1.3.2.tar.xz 662788 BLAKE2B cccca2d8102272ca4ddb78590ef7818de7970d9073484cdb4d343842c30318f262a01eab45ed0de8fc41c2824a33a2f2bec495df3fe0b9d1b9dfd022de2748ca SHA512 839ff8818064ae89dfbb44cd476f7b2e0e7048258c38294a5fe570434e07796033a161d3a6c788c2317dba6af6cfe3f6472a719e78e15388d649ff72519644ea -EBUILD haruna-1.3.2.ebuild 1422 BLAKE2B 4d21123b70d353904126037b6f85098d1f588e9007806629b8ceb02b4a018365afc5d2ebaf65d3b5cc6c67f19d6ceb4c742387bc5ddffdf9e2861d5c49452865 SHA512 66fffd133e3781e6aea92f7f1a24cff923cacc5c201b783e39a3c0d30222c7cb7a577b8ab4da554111635296b4a9e2d48006bd9eaaaaec411692be8dacf84a27 +DIST haruna-1.3.3.tar.xz 663064 BLAKE2B fd0ba2c274a2c0e5f3365a10993a048165e2c5274bcb75dcf9e60be5f38c2579a6125ee5c55bd933083f21d5a30b69e22d0608eb7e12909d7a354c62d37f19de SHA512 ed5d971ee6495f6d4369112350732d4e07b122178220a2dd19d00ac8661eebdc8df7e3b45646c03532c8b369534929c559bb49a0eded1d1ebfd0e36c1d568ddf +EBUILD haruna-1.3.3.ebuild 1281 BLAKE2B feba5cb77a6f2efff7c18da03c3c0906d0ad9da3cb2277a44a652a2ddac2750acbb1342098aaf73eb661604f4aeabed502378d0d77b681e70d0c45cd8a9ca2c6 SHA512 1c36973ec3aa1b5060c80a3916fc43939f736b415ddf5a9b838dc2e026837640e74ab5b62c75e4563c1ec35c0511d39d035c814b68647befc89c397a8d61d9ba MISC metadata.xml 407 BLAKE2B e52f0a4099381cd9c4e5a2187edb15411ac4c2ab37957156316edb14575b625b7f6fcc531af1672f6eec05b6335da59cc41d7079c5413c21aed0738f572240f8 SHA512 4a151d15e9dcf0a0bc486a4f5614c8fab5d0ba2ee534412263ab9baf3449e9881c5e1597519bc5e5b529fc80cf508819f8625d5ce65dedea7fe818d55a518c28 diff --git a/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch b/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch deleted file mode 100644 index 2b20e2d29972..000000000000 --- a/media-video/haruna/files/haruna-1.3.2-system-kdsingleapplication.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 11a36a50558bdbc9c42253b937c8a832d896248f Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 21 Feb 2025 22:28:27 +0100 -Subject: [PATCH] Make it possible to build against system kdsingleapplication - -Bundling must be avoided wherever possible. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 7 +++++++ - src/CMakeLists.txt | 23 ++++++++++++++++++++--- - 2 files changed, 27 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ac49e01f..990ff871 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,6 +112,13 @@ set_package_properties(Ytdlp PROPERTIES TYPE RUNTIME - URL "https://github.com/yt-dlp/yt-dlp" - DESCRIPTION "needed to play videos from youtube and other online sources") - -+find_package(KDSingleApplication-qt6 QUIET) -+if(KDSingleApplication-qt6_FOUND) -+ message(STATUS "Using system KDSingleApplication") -+else() -+ message(STATUS "Using bundled KDSingleApplication") -+endif() -+ - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - - include(KDEInstallDirs) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ef334a52..da9dd493 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -16,8 +16,6 @@ target_sources(haruna - application.h application.cpp - framedecoder.h framedecoder.cpp - global.h global.cpp -- KDSingleApplication/kdsingleapplication_localsocket_p.h KDSingleApplication/kdsingleapplication_localsocket.cpp -- KDSingleApplication/kdsingleapplication.h KDSingleApplication/kdsingleapplication.cpp - main.cpp - models/actionsmodel.h models/actionsmodel.cpp - models/chaptersmodel.h models/chaptersmodel.cpp -@@ -34,6 +32,14 @@ target_sources(haruna - ${ICONS_SRCS} - ) - -+if (NOT KDSingleApplication-qt6_FOUND) -+ target_sources(haruna -+ PRIVATE -+ KDSingleApplication/kdsingleapplication_localsocket_p.h KDSingleApplication/kdsingleapplication_localsocket.cpp -+ KDSingleApplication/kdsingleapplication.h KDSingleApplication/kdsingleapplication.cpp -+ ) -+endif() -+ - if (CMAKE_SYSTEM_NAME IN_LIST DBUS_PLATFORMS) - qt_add_dbus_interface(haruna_screensaver_inhibit_SRCS ../org.freedesktop.ScreenSaver.xml screensaverdbusinterface) - target_sources(haruna -@@ -126,12 +132,18 @@ qt_add_qml_module(haruna - - target_include_directories(haruna - PRIVATE -- KDSingleApplication - models - mpv - ${FFMPEG_INCLUDE_DIRS} - ) - -+if (NOT KDSingleApplication-qt6_FOUND) -+ target_include_directories(haruna -+ PRIVATE -+ KDSingleApplication -+ ) -+endif() -+ - target_compile_definitions(haruna PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>) - - target_link_libraries(haruna PRIVATE -@@ -161,6 +173,11 @@ target_link_libraries(haruna PRIVATE - ${AVCODEC_LIBRARIES} - ${SWSCALE_LIBRARIES} - ) -+if(KDSingleApplication-qt6_FOUND) -+ target_link_libraries(haruna PRIVATE -+ KDAB::kdsingleapplication -+ ) -+endif() - - if (CMAKE_SYSTEM_NAME IN_LIST DBUS_PLATFORMS) - target_link_libraries(haruna PRIVATE --- -2.48.1 - diff --git a/media-video/haruna/haruna-1.3.2.ebuild b/media-video/haruna/haruna-1.3.3.ebuild index d1f15ee60786..028cd78c6d54 100644 --- a/media-video/haruna/haruna-1.3.2.ebuild +++ b/media-video/haruna/haruna-1.3.3.ebuild @@ -46,6 +46,3 @@ DEPEND=" RDEPEND="${DEPEND} net-misc/yt-dlp " - -# Upstream MR: https://invent.kde.org/multimedia/haruna/-/merge_requests/56 -PATCHES=( "${FILESDIR}/${P}-system-kdsingleapplication.patch" ) |