From 529abfa74a08ae5099db9780bcdf8250aa52ecb6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Dec 2022 14:59:59 +0000 Subject: gentoo auto-resync : 03:12:2022 - 14:59:58 --- kde-apps/k3b/Manifest | 3 - kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch | 92 ----------------- kde-apps/k3b/k3b-22.04.3-r1.ebuild | 119 ---------------------- 3 files changed, 214 deletions(-) delete mode 100644 kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch delete mode 100644 kde-apps/k3b/k3b-22.04.3-r1.ebuild (limited to 'kde-apps/k3b') diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest index 61b2d6cca57c..ab936f18505b 100644 --- a/kde-apps/k3b/Manifest +++ b/kde-apps/k3b/Manifest @@ -1,6 +1,3 @@ -AUX k3b-22.04.3-fstab_h-musl.patch 3003 BLAKE2B 08a7c1104b518310bd91133a2e4c54cf2203251201632aea8346fb03cf5370a9a59570f0c1e37f3013dcb788f2f3c4c6e949fed162c6b4e061c42d01e47afb3c SHA512 5b1564614e00a33830ee4340d382560e2fef069d490f9db2c6aa99f8344a5032e42b6dcf814bf8139d71a640848deee3c4c6d0f11f25cf7604e7cb4bec47fb0d -DIST k3b-22.04.3.tar.xz 10745764 BLAKE2B 9418fbd782402d5b315345efbf4d0862b605926a9298eba0f1463d79e6a595456924c8c4fb139fed347ed583f44f67ad55227f5d795b65af4a8311b90c420ea1 SHA512 90c30ab34478565a70d15f49d20501577cdf741084e6f253b9dd9d040867a536d4e14d1d84406ff72dc00d9cfad5ea7210ebc8c61fcde37359147d791079f066 DIST k3b-22.08.3.tar.xz 10764540 BLAKE2B 8168fa4188151f421c0c5fe1254ccabf7243e6b8afcce17bc5bcf07badf28ee51f714fd0fdfaf5d16745960c637f26c75644b81c1eb1db4f29dc1cd8640d8670 SHA512 cdedcd52528f907064b608f902cd1a1a66b4b909236697c1e0b12765a61a8b3b66b8bd823f61c23a3bc2a98fbb428caba2a99e6066e65f41f5131336cb3b2245 -EBUILD k3b-22.04.3-r1.ebuild 3405 BLAKE2B a5c0715b0adfa5639ce580347c31e08a922ab748c67e9175fd4278fdb7ba66a454c847d7d8c7f82ac22fc7123c41469abcb1e51837a6b9e3b861096d1a706a22 SHA512 c00a1ac288ddddfa864e60a145cf6ee55bbe1c09f247c93dee1f63f77a4b0a1d145848543219f257cf8652164d0de7edc887a8a83abf39585bf5c3f217f80c22 EBUILD k3b-22.08.3.ebuild 3344 BLAKE2B 7c845aef3a6c7bd95440cb4e81004d52b66e7194d5ea0605105e58ffcc92d1faa284cb146403bad9b2b07a004520d452d386abdfbdaad828c2262cc9e3fc5fa7 SHA512 d6d1f378020fbc19cc805cc2578e6a23a7e203b488f2762363386402d3bc466517b0fdaa1dbb1f5e33b19a3a9eaf6fb320b13fd75b2743240840fde2ae253951 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch b/kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch deleted file mode 100644 index 41e2bcd844a5..000000000000 --- a/kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch +++ /dev/null @@ -1,92 +0,0 @@ -https://invent.kde.org/multimedia/k3b/-/merge_requests/16 -https://invent.kde.org/multimedia/k3b/-/merge_requests/16#note_323616 - -https://invent.kde.org/multimedia/k3b/-/merge_requests/32 - -From a8f810d6a245363402c103fc8a949ddf99297720 Mon Sep 17 00:00:00 2001 -From: Alfred Persson Forsberg -Date: Thu, 14 Jul 2022 21:07:32 +0200 -Subject: [PATCH] k3bsystemproblemdialog.cpp: Check for HAVE_FSTAB_H - -Signed-off-by: Alfred Persson Forsberg ---- - src/k3bsystemproblemdialog.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp -index 317f957d8..16393023d 100644 ---- a/src/k3bsystemproblemdialog.cpp -+++ b/src/k3bsystemproblemdialog.cpp -@@ -49,7 +49,7 @@ - #include - #endif - --#ifndef Q_OS_WIN32 -+#ifdef HAVE_FSTAB_H - #include - #endif - #include -@@ -388,7 +388,7 @@ void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel le - dvd_r_dl = true; - } - --#ifndef Q_OS_WIN32 -+#ifdef HAVE_FSTAB_H - // check automounted devices - QList automountedDevices = checkForAutomounting(); - for( QList::const_iterator it = automountedDevices.constBegin(); -@@ -676,7 +676,7 @@ int K3b::SystemProblemDialog::dmaActivated( K3b::Device::Device* dev ) - } - - --#ifndef Q_OS_WIN32 -+#ifdef HAVE_FSTAB_H - QList K3b::SystemProblemDialog::checkForAutomounting() - { - QList l; --- -GitLab - -https://invent.kde.org/multimedia/k3b/-/merge_requests/16 -https://invent.kde.org/multimedia/k3b/-/merge_requests/16#note_323616 - -https://invent.kde.org/multimedia/k3b/-/merge_requests/32 - -From 3a76314adbe12b6046a5ee8095696d894321c98e Mon Sep 17 00:00:00 2001 -From: Alfred Persson Forsberg -Date: Thu, 14 Jul 2022 21:01:09 +0200 -Subject: [PATCH] Add HAVE_FSTAB_H checks in CMake - -fstab.h does not exist on musl. -See: https://invent.kde.org/multimedia/k3b/-/merge_requests/16#note_323616 - -Signed-off-by: Alfred Persson Forsberg ---- - cmake/modules/ConfigureChecks.cmake | 1 + - config-k3b.h.cmake | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/cmake/modules/ConfigureChecks.cmake b/cmake/modules/ConfigureChecks.cmake -index 4aae72eed..507f357d5 100644 ---- a/cmake/modules/ConfigureChecks.cmake -+++ b/cmake/modules/ConfigureChecks.cmake -@@ -10,5 +10,6 @@ check_function_exists(stat64 HAVE_STAT64) - check_include_files(sys/vfs.h HAVE_SYS_VFS_H) - check_include_files(sys/statvfs.h HAVE_SYS_STATVFS_H) - check_include_files(byteswap.h HAVE_BYTESWAP_H) -+check_include_files(fstab.h HAVE_FSTAB_H) - - test_big_endian(WORDS_BIGENDIAN) -diff --git a/config-k3b.h.cmake b/config-k3b.h.cmake -index 3d48241f9..38c1bc8cc 100644 ---- a/config-k3b.h.cmake -+++ b/config-k3b.h.cmake -@@ -26,3 +26,5 @@ - - #cmakedefine HAVE_ICONV - #cmakedefine ICONV_SECOND_ARGUMENT_IS_CONST -+ -+#cmakedefine HAVE_FSTAB_H --- -GitLab - diff --git a/kde-apps/k3b/k3b-22.04.3-r1.ebuild b/kde-apps/k3b/k3b-22.04.3-r1.ebuild deleted file mode 100644 index 47ac6f2b664a..000000000000 --- a/kde-apps/k3b/k3b-22.04.3-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.4 -inherit ecm gear.kde.org - -DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b" - -LICENSE="GPL-2 FDL-1.2" -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" - -REQUIRED_USE=" - flac? ( taglib ) - mp3? ( encode taglib ) - sox? ( encode taglib ) -" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/libkcddb-${PVCUT}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?] - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - media-libs/libsamplerate - dvd? ( media-libs/libdvdread:= ) - flac? ( >=media-libs/flac-1.2:=[cxx] ) - mp3? ( media-sound/lame ) - mad? ( media-libs/libmad ) - musepack? ( >=media-sound/musepack-tools-444 ) - sndfile? ( media-libs/libsndfile ) - taglib? ( >=media-libs/taglib-1.5 ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -RDEPEND="${DEPEND} - app-cdr/cdrdao - app-cdr/cdrtools - dev-libs/libburn - media-sound/cdparanoia - dvd? ( - >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) - ) - sox? ( media-sound/sox ) - vcd? ( media-video/vcdimager ) -" - -DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) - -PATCHES=( - "${FILESDIR}"/${PN}-22.04.3-fstab_h-musl.patch -) - -src_configure() { - local mycmakeargs=( - -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON - -DK3B_ENABLE_HAL_SUPPORT=OFF - -DK3B_ENABLE_MUSICBRAINZ=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON - -DK3B_DEBUG=$(usex debug) - -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) - -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) - -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) - -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) - -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) - -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) - -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) - -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) - -DK3B_ENABLE_TAGLIB=$(usex taglib) - -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) - -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - elog "If you get warnings on start-up, uncheck the \"Check system" - elog "configuration\" option in the \"Misc\" settings window." - elog - local group=cdrom - use kernel_linux || group=operator - elog "Make sure you have proper read/write permissions on optical device(s)." - elog "Usually, it is sufficient to be in the ${group} group." -} -- cgit v1.2.3