[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 9ff7ec20e0c061edec9bd6864b66c034c6b0d6d9
Author: Eli Schwartz gentoo org>
AuthorDate: Tue Sep 3 04:00:56 2024 +
Commit: Eli Schwartz gentoo org>
CommitDate: Tue Sep 3 05:29:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff7ec20
kde-apps/k3b: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/924376
Acked-by: Sam James gentoo.org>
Signed-off-by: Eli Schwartz gentoo.org>
kde-apps/k3b/k3b-24.05.2.ebuild | 7 ++-
kde-apps/k3b/k3b-24.08.0.ebuild | 7 ++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/kde-apps/k3b/k3b-24.05.2.ebuild b/kde-apps/k3b/k3b-24.05.2.ebuild
index b55952931f5c..6394a318a2a1 100644
--- a/kde-apps/k3b/k3b-24.05.2.ebuild
+++ b/kde-apps/k3b/k3b-24.05.2.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
PVCUT=$(ver_cut 1-3)
KFMIN=5.115.0
QTMIN=5.15.12
-inherit ecm gear.kde.org
+inherit ecm flag-o-matic 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";
@@ -73,6 +73,11 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924376
+ # https://bugs.kde.org/show_bug.cgi?id=492571
+ filter-lto
+
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
diff --git a/kde-apps/k3b/k3b-24.08.0.ebuild b/kde-apps/k3b/k3b-24.08.0.ebuild
index a9f20c82d9b6..9107708962eb 100644
--- a/kde-apps/k3b/k3b-24.08.0.ebuild
+++ b/kde-apps/k3b/k3b-24.08.0.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
PVCUT=$(ver_cut 1-3)
KFMIN=6.5.0
QTMIN=6.7.2
-inherit ecm gear.kde.org
+inherit ecm flag-o-matic 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";
@@ -69,6 +69,11 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
src_configure() {
+ # -Werror=odr, -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/924376
+ # https://bugs.kde.org/show_bug.cgi?id=492571
+ filter-lto
+
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 11a697980a73fd95b102599066e10caa541f7150 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Jul 14 05:58:49 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Jul 14 05:58:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a69798 kde-apps/k3b: Stabilize 24.05.2 x86, #935994 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/k3b/k3b-24.05.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-24.05.2.ebuild b/kde-apps/k3b/k3b-24.05.2.ebuild index f6c01c9cd8a9..b55952931f5c 100644 --- a/kde-apps/k3b/k3b-24.05.2.ebuild +++ b/kde-apps/k3b/k3b-24.05.2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 8df882e0b83e6033fe93cc9853c82b7f353b72ec Author: Sam James gentoo org> AuthorDate: Sat Jul 13 22:43:19 2024 + Commit: Sam James gentoo org> CommitDate: Sat Jul 13 22:43:19 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8df882e0 kde-apps/k3b: Stabilize 24.05.2 arm64, #935994 Signed-off-by: Sam James gentoo.org> kde-apps/k3b/k3b-24.05.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-24.05.2.ebuild b/kde-apps/k3b/k3b-24.05.2.ebuild index 7cdfb30b7613..e35c574f0eaa 100644 --- a/kde-apps/k3b/k3b-24.05.2.ebuild +++ b/kde-apps/k3b/k3b-24.05.2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 324c51298a3b213b9f74e6f455eda0511eb0580e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 17 18:12:32 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 17 18:49:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=324c5129
kde-apps/k3b: drop 24.02.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/Manifest | 1 -
kde-apps/k3b/k3b-24.02.2.ebuild | 110
2 files changed, 111 deletions(-)
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 3ecdc9870a41..14660dc32351 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,2 +1 @@
-DIST k3b-24.02.2.tar.xz 10968224 BLAKE2B
3520c6173eab8ad58a9c6d8d6c7baf0704ac90572382be12b0b2f68515dbc120755fec945415bc5a96dd1cf714a73f59a78e70769863f7e6174a0b8882a1895f
SHA512
005c6a782d80e8365b65d2a6c2f5a609cd1b5bf805d010f6bbb85438423b840efb630219171d06ecd67d1c4c48e06fb1a0c794b8e6dcb7b2788fb68a07095ee6
DIST k3b-24.05.1.tar.xz 10691324 BLAKE2B
8e62ff69dc0984936ff326020ec392a30e4b1d531abc51f7024ebbf406128031fe9b5ccfb00c797ac64bb7fa15bbae679d6d3e2ff478c83c2225af70eaff706d
SHA512
2a8a8d3be7e07c5b29b4b26fa3fd6df5657d05abd25d4b8adf36197e937aeb856563b91701cf2a2a410f5a8c8ba82c2d89727bf3fc003cc0be9947ce9d401c1b
diff --git a/kde-apps/k3b/k3b-24.02.2.ebuild b/kde-apps/k3b/k3b-24.02.2.ebuild
deleted file mode 100644
index b55952931f5c..
--- a/kde-apps/k3b/k3b-24.02.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 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.115.0
-QTMIN=5.15.12
-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 ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis
webengine"
-
-REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( 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-23.08.4: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/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread:= )
- ffmpeg? ( media-video/ffmpeg:0= )
- flac? ( >=media-libs/flac-1.2:=[cxx] )
- lame? ( 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
- )
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-RDEPEND="${DEPEND}
- app-cdr/cdrdao
- app-cdr/cdrtools
- dev-libs/libburn
- media-sound/cdparanoia
- dvd? ( >=app-cdr/dvd+rw-tools-7 )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
- local mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- -DK3B_DEBUG=$(usex debug)
- -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
- -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
- -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_P
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: cca066f13212bd2346758149ce25f72c1dc6f4cb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Apr 23 19:16:30 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Apr 25 20:40:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cca066f1
kde-apps/k3b: drop 23.08.5
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/Manifest | 1 -
kde-apps/k3b/k3b-23.08.5.ebuild | 113
2 files changed, 114 deletions(-)
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index b836111e0743..2c1fdcc6c03e 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,2 +1 @@
-DIST k3b-23.08.5.tar.xz 10967984 BLAKE2B
736ccb30e07f962b845e41a62a5556dfb005e3cb7aba4f4f5ac90aa66818383b5a6eeb465ce22144c299b9968e1a690a645c0cf77d98584324db2880ebf032b8
SHA512
d7e951d4aea07e8e55279b2a835e7b06e7fdec34a9accaedf1846db238eff215d7e56fc4c6fa8b80e2fa50f36795d8bad500c6ec4afa9ebfb34df86545a74156
DIST k3b-24.02.2.tar.xz 10968224 BLAKE2B
3520c6173eab8ad58a9c6d8d6c7baf0704ac90572382be12b0b2f68515dbc120755fec945415bc5a96dd1cf714a73f59a78e70769863f7e6174a0b8882a1895f
SHA512
005c6a782d80e8365b65d2a6c2f5a609cd1b5bf805d010f6bbb85438423b840efb630219171d06ecd67d1c4c48e06fb1a0c794b8e6dcb7b2788fb68a07095ee6
diff --git a/kde-apps/k3b/k3b-23.08.5.ebuild b/kde-apps/k3b/k3b-23.08.5.ebuild
deleted file mode 100644
index 369081cec839..
--- a/kde-apps/k3b/k3b-23.08.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2024 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.106.0
-QTMIN=5.15.9
-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 ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis
webengine"
-
-REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( 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:= )
- ffmpeg? ( media-video/ffmpeg:0= )
- flac? ( >=media-libs/flac-1.2:=[cxx] )
- lame? ( 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
- )
- webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-RDEPEND="${DEPEND}
- app-cdr/cdrdao
- app-cdr/cdrtools
- dev-libs/libburn
- media-sound/cdparanoia
- dvd? ( >=app-cdr/dvd+rw-tools-7 )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585,
906526
-
-src_configure() {
- local mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- -DK3B_DEBUG=$(usex debug)
- -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
- -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
- -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
- -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
- -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
- -DK3B_
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 6ea6fdcb68e2f3ebce6350b138e1e75e2bcbf91a Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 06:31:57 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 06:31:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea6fdcb kde-apps/k3b: Stabilize 24.02.2 amd64, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/k3b/k3b-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-24.02.2.ebuild b/kde-apps/k3b/k3b-24.02.2.ebuild index fb00b3b10436..b55952931f5c 100644 --- a/kde-apps/k3b/k3b-24.02.2.ebuild +++ b/kde-apps/k3b/k3b-24.02.2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: fe4efd3542bb079cecbcbcac426c8b8237d470ee Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 06:24:26 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 06:24:26 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe4efd35 kde-apps/k3b: Stabilize 24.02.2 x86, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/k3b/k3b-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-24.02.2.ebuild b/kde-apps/k3b/k3b-24.02.2.ebuild index e35c574f0eaa..fb00b3b10436 100644 --- a/kde-apps/k3b/k3b-24.02.2.ebuild +++ b/kde-apps/k3b/k3b-24.02.2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="~amd64 arm64 ~ppc64 ~riscv x86" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: c805d0cdd76e9e00ba4c24394b5967f5d91146be Author: Arthur Zamarin gentoo org> AuthorDate: Tue Apr 23 05:25:43 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Apr 23 05:25:57 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c805d0cd kde-apps/k3b: Stabilize 24.02.2 arm64, #930370 Signed-off-by: Arthur Zamarin gentoo.org> kde-apps/k3b/k3b-24.02.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-24.02.2.ebuild b/kde-apps/k3b/k3b-24.02.2.ebuild index 7cdfb30b7613..e35c574f0eaa 100644 --- a/kde-apps/k3b/k3b-24.02.2.ebuild +++ b/kde-apps/k3b/k3b-24.02.2.ebuild @@ -15,7 +15,7 @@ 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" +KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/, kde-apps/k3b/files/
commit: c65bd23152d13d499b085a6854efac9ad3eb4cc2
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jul 6 11:56:10 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jul 6 12:12:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65bd231
kde-apps/k3b: Re-enable external encoder plugin
Hard-disable transcode in code by reverting upstream commit
f7d385a40cc062fa4db46c165f82f437dea82c58.
Bug: https://bugs.gentoo.org/891585
Closes: https://bugs.gentoo.org/906526
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../k3b/files/k3b-23.04.2-disable-transcode.patch | 38 ++
.../{k3b-23.04.2.ebuild => k3b-23.04.2-r1.ebuild} | 4 ++-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch
b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch
new file mode 100644
index ..209c13cd4546
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch
@@ -0,0 +1,38 @@
+From cc1e0b76f080ed95c1f6e6d66ad806427f373909 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Thu, 6 Jul 2023 13:52:04 +0200
+Subject: [PATCH] Revert "Keep transcode until a replacement is implemented."
+
+Make sure users are not presented with a completely broken option.
+
+This reverts commit f7d385a40cc062fa4db46c165f82f437dea82c58.
+
+Signed-off-by: Andreas Sturmlechner
+---
+ libk3b/core/k3bdefaultexternalprograms.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp
b/libk3b/core/k3bdefaultexternalprograms.cpp
+index e659fc1f8..2ebf88367 100644
+--- a/libk3b/core/k3bdefaultexternalprograms.cpp
b/libk3b/core/k3bdefaultexternalprograms.cpp
+@@ -37,6 +37,8 @@ void K3b::addDefaultPrograms( K3b::ExternalBinManager* m )
+ // https://bugs.kde.org/show_bug.cgi?id=381131
+ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m)
+ {
++Q_UNUSED(m);
++/* Deprecated transcode
+ static const char* const transcodeTools[] = {"transcode",
+ 0, // K3b 1.0 only uses the
transcode binary
+ "tcprobe",
+@@ -48,6 +50,7 @@ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m)
+
+ for (int i = 0; transcodeTools[i]; ++i)
+ m->addProgram(new K3b::TranscodeProgram(transcodeTools[i]));
++*/
+ }
+
+
+--
+2.41.0
+
diff --git a/kde-apps/k3b/k3b-23.04.2.ebuild
b/kde-apps/k3b/k3b-23.04.2-r1.ebuild
similarity index 96%
rename from kde-apps/k3b/k3b-23.04.2.ebuild
rename to kde-apps/k3b/k3b-23.04.2-r1.ebuild
index d072c2b7d0bb..12bcb8cce68c 100644
--- a/kde-apps/k3b/k3b-23.04.2.ebuild
+++ b/kde-apps/k3b/k3b-23.04.2-r1.ebuild
@@ -72,10 +72,12 @@ RDEPEND="${DEPEND}
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585,
906526
+
src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF
+ -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 628dd1818e157aa1bcb61f345750943974a65c80
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Apr 23 11:12:22 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Apr 23 11:41:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=628dd181
kde-apps/k3b: Re-add IUSE (rename mp3 => lame), sox
Remaining *_ENCODER_PLUGIN flags appear to still work fine without
external encoder, just like ogg which had not been dropped.
This partially reverts commit 922fbdd8be012b4d8c9c936a0fdcfa8cd48058b8.
Closes: https://bugs.gentoo.org/904010
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/{k3b-22.12.3.ebuild => k3b-22.12.3-r1.ebuild} | 10 ++
kde-apps/k3b/{k3b-23.04.0.ebuild => k3b-23.04.0-r1.ebuild} | 10 ++
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/kde-apps/k3b/k3b-22.12.3.ebuild
b/kde-apps/k3b/k3b-22.12.3-r1.ebuild
similarity index 91%
rename from kde-apps/k3b/k3b-22.12.3.ebuild
rename to kde-apps/k3b/k3b-22.12.3-r1.ebuild
index 3b480cf39c26..e2d10e921f7e 100644
--- a/kde-apps/k3b/k3b-22.12.3.ebuild
+++ b/kde-apps/k3b/k3b-22.12.3-r1.ebuild
@@ -16,9 +16,9 @@ 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 ffmpeg flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
-REQUIRED_USE="flac? ( taglib )"
+REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -50,6 +50,7 @@ DEPEND="
dvd? ( media-libs/libdvdread:= )
ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2:=[cxx] )
+ lame? ( media-sound/lame )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
sndfile? ( media-libs/libsndfile )
@@ -65,6 +66,7 @@ RDEPEND="${DEPEND}
dev-libs/libburn
media-sound/cdparanoia
dvd? ( >=app-cdr/dvd+rw-tools-7 )
+ sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
@@ -74,8 +76,6 @@ src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
- -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
@@ -84,9 +84,11 @@ src_configure() {
-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+ -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
-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)
diff --git a/kde-apps/k3b/k3b-23.04.0.ebuild
b/kde-apps/k3b/k3b-23.04.0-r1.ebuild
similarity index 91%
rename from kde-apps/k3b/k3b-23.04.0.ebuild
rename to kde-apps/k3b/k3b-23.04.0-r1.ebuild
index f3a010b8b1e8..27165eb02634 100644
--- a/kde-apps/k3b/k3b-23.04.0.ebuild
+++ b/kde-apps/k3b/k3b-23.04.0-r1.ebuild
@@ -16,9 +16,9 @@ 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 ffmpeg flac mad musepack sndfile taglib vcd vorbis"
+IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
-REQUIRED_USE="flac? ( taglib )"
+REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -50,6 +50,7 @@ DEPEND="
dvd? ( media-libs/libdvdread:= )
ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2:=[cxx] )
+ lame? ( media-sound/lame )
mad? ( media-libs/libmad )
musepack? ( >=media-sound/musepack-tools-444 )
sndfile? ( media-libs/libsndfile )
@@ -65,6 +66,7 @@ RDEPEND="${DEPEND}
dev-libs/libburn
media-sound/cdparanoia
dvd? ( >=app-cdr/dvd+rw-tools-7 )
+ sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
@@ -74,8 +76,6 @@ src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF
- -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF
- -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF
-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-DK3B_ENABLE_HAL_SUPPORT=OFF
-DK3B_ENABLE_MUSICBRAINZ=OFF
@@ -84,9 +84,11 @@ src_con
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/files/
commit: 9701d37634f5ee3a31c270bf5bf9723c87d023eb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Dec 3 10:49:27 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 3 10:50:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9701d376
kde-apps/k3b: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch | 92 ---
1 file changed, 92 deletions(-)
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..
--- 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
-
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/files/, kde-apps/k3b/
commit: 40785401e3bb4a63dfc20fd71e54346f6d7ed132
Author: Alfred Persson Forsberg catcream org>
AuthorDate: Thu Jul 14 19:29:03 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 17 07:21:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40785401
kde-apps/k3b: fix build on musl
fstab.h is not available on musl, this patch adds a header check in CMake
and checks for it in the appropriate source file.
See: https://invent.kde.org/multimedia/k3b/-/merge_requests/16,
https://invent.kde.org/multimedia/k3b/-/merge_requests/32
Signed-off-by: Alfred Persson Forsberg catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/26410
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch | 92 +++
kde-apps/k3b/k3b-22.04.3.ebuild | 4 +
2 files changed, 96 insertions(+)
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
new file mode 100644
index ..41e2bcd844a5
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-22.04.3-fstab_h-musl.patch
@@ -0,0 +1,92 @@
+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.ebuild b/kde-apps/k3b/k3b-22.04.3.ebuild
index 4412686b891a..76718d572ffe 100644
--- a/kde-apps/k3b/k3b-22.04.3.ebuild
+++ b/kde-apps/k3b/k3b-22.04.3.ebuild
@@ -78,6 +78,10 @@ RDEPEND="${DEPEND}
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
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 5f3b9752fb04cf2e08eae806d3fdb5e40fbbdced Author: Alex Fan yahoo com> AuthorDate: Mon Sep 27 09:22:49 2021 + Commit: Yixun Lan gentoo org> CommitDate: Mon Sep 27 14:04:36 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3b9752 kde-apps/k3b: keyword 21.08.1 for ~riscv Signed-off-by: Alex Fan yahoo.com> Signed-off-by: Yixun Lan gentoo.org> kde-apps/k3b/k3b-21.08.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-21.08.1.ebuild b/kde-apps/k3b/k3b-21.08.1.ebuild index a9d464b2324..75c6a9253a3 100644 --- a/kde-apps/k3b/k3b-21.08.1.ebuild +++ b/kde-apps/k3b/k3b-21.08.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"; LICENSE="GPL-2 FDL-1.2" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 89d259771b2df024f1134c666de802dd87e8affd
Author: Michał Górny gentoo org>
AuthorDate: Fri Dec 18 08:57:28 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Dec 18 09:00:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d25977
kde-apps/k3b: Inline virtual/cdrtools
Signed-off-by: Michał Górny gentoo.org>
kde-apps/k3b/k3b-20.08.3.ebuild | 2 +-
kde-apps/k3b/k3b-20.12.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-apps/k3b/k3b-20.08.3.ebuild b/kde-apps/k3b/k3b-20.08.3.ebuild
index 7187e896a88..cfe5805e133 100644
--- a/kde-apps/k3b/k3b-20.08.3.ebuild
+++ b/kde-apps/k3b/k3b-20.08.3.ebuild
@@ -66,9 +66,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-libs/libburn
media-sound/cdparanoia
- virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
diff --git a/kde-apps/k3b/k3b-20.12.0.ebuild b/kde-apps/k3b/k3b-20.12.0.ebuild
index 2b788559cf7..dac793b6801 100644
--- a/kde-apps/k3b/k3b-20.12.0.ebuild
+++ b/kde-apps/k3b/k3b-20.12.0.ebuild
@@ -66,9 +66,9 @@ DEPEND="
"
RDEPEND="${DEPEND}
app-cdr/cdrdao
+ app-cdr/cdrtools
dev-libs/libburn
media-sound/cdparanoia
- virtual/cdrtools
dvd? (
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 9c70008efa900f1f504ac2e6ed4e3343aa2c Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Oct 16 10:33:21 2020 + Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Oct 16 17:45:14 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c70008e kde-apps/k3b: add ~ppc64 keyword 100% tests passed, 0 tests failed out of 6 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Georgy Yakovlev gentoo.org> kde-apps/k3b/k3b-20.08.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-20.08.2.ebuild b/kde-apps/k3b/k3b-20.08.2.ebuild index 7807ff5baa3..7ea3751146d 100644 --- a/kde-apps/k3b/k3b-20.08.2.ebuild +++ b/kde-apps/k3b/k3b-20.08.2.ebuild @@ -16,7 +16,7 @@ https://userbase.kde.org/K3b"; LICENSE="GPL-2 FDL-1.2" SLOT="5" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE="
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 344ef7b1a3da57ce5c97e58ea464b56ef403fba0
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Apr 25 17:21:15 2020 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Apr 25 17:21:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344ef7b1
kde-apps/k3b: migrate from libav
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada gentoo.org>
kde-apps/k3b/k3b-19.12.3.ebuild | 7 ++-
kde-apps/k3b/k3b-20.04.0.ebuild | 7 ++-
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/kde-apps/k3b/k3b-19.12.3.ebuild b/kde-apps/k3b/k3b-19.12.3.ebuild
index 154711497a7..0b6e9c0f13a 100644
--- a/kde-apps/k3b/k3b-19.12.3.ebuild
+++ b/kde-apps/k3b/k3b-19.12.3.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b";
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
KEYWORDS="amd64 arm64 x86"
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd
vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis
webkit"
REQUIRED_USE="
flac? ( taglib )
@@ -53,10 +53,7 @@ DEPEND="
>=dev-qt/qtxml-${QTMIN}:5
media-libs/libsamplerate
dvd? ( media-libs/libdvdread:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
diff --git a/kde-apps/k3b/k3b-20.04.0.ebuild b/kde-apps/k3b/k3b-20.04.0.ebuild
index 76f61aeb976..68fe0dac27b 100644
--- a/kde-apps/k3b/k3b-20.04.0.ebuild
+++ b/kde-apps/k3b/k3b-20.04.0.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b";
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
KEYWORDS="~amd64"
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd
vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis
webkit"
REQUIRED_USE="
flac? ( taglib )
@@ -53,10 +53,7 @@ DEPEND="
>=dev-qt/qtxml-${QTMIN}:5
media-libs/libsamplerate
dvd? ( media-libs/libdvdread:= )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
+ ffmpeg? ( media-video/ffmpeg:0= )
flac? ( >=media-libs/flac-1.2[cxx] )
mp3? ( media-sound/lame )
mad? ( media-libs/libmad )
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 999425cab7722abee8615e4bf1b2e6a11a68b81a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 9 17:36:03 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 9 18:19:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999425ca
kde-apps/k3b: Drop USE emovix
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/k3b/k3b-19.12.1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/kde-apps/k3b/k3b-19.12.1.ebuild b/kde-apps/k3b/k3b-19.12.1.ebuild
index 27b7b84bfc6..133fad51c62 100644
--- a/kde-apps/k3b/k3b-19.12.1.ebuild
+++ b/kde-apps/k3b/k3b-19.12.1.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b";
LICENSE="GPL-2 FDL-1.2"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib
vcd vorbis webkit"
+IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd
vorbis webkit"
REQUIRED_USE="
flac? ( taglib )
@@ -78,7 +78,6 @@ RDEPEND="${DEPEND}
>=app-cdr/dvd+rw-tools-7
encode? ( media-video/transcode[dvd] )
)
- emovix? ( media-video/emovix )
sox? ( media-sound/sox )
vcd? ( media-video/vcdimager )
"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 527b9fe3f9bd6f97f01bade5dbf0a3a1864b7374 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 1 16:15:43 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 1 17:00:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=527b9fe3 kde-apps/k3b: amd64 stable wrt bug 670862 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 kde-apps/k3b/k3b-18.08.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-18.08.3.ebuild b/kde-apps/k3b/k3b-18.08.3.ebuild index ca07f5b8b2f..ca4d83290a3 100644 --- a/kde-apps/k3b/k3b-18.08.3.ebuild +++ b/kde-apps/k3b/k3b-18.08.3.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor HOMEPAGE="https://userbase.kde.org/K3b"; LICENSE="GPL-2 FDL-1.2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" DEPEND="
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 14bce45dc96826ccf9233003caa631ade73549c3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Aug 18 20:54:37 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Aug 18 20:57:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14bce45d
kde-apps/k3b: Disable broken test
Gentoo-bug: 628166
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-apps/k3b/k3b-17.08.0.ebuild | 9 +
1 file changed, 9 insertions(+)
diff --git a/kde-apps/k3b/k3b-17.08.0.ebuild b/kde-apps/k3b/k3b-17.08.0.ebuild
index e0f4fb461bd..8c9730fc833 100644
--- a/kde-apps/k3b/k3b-17.08.0.ebuild
+++ b/kde-apps/k3b/k3b-17.08.0.ebuild
@@ -102,6 +102,15 @@ src_configure() {
kde5_src_configure
}
+src_test() {
+ # 628166
+ local myctestargs=(
+ -E "(k3bdeviceglobalstest)"
+ )
+
+ kde5_src_test
+}
+
pkg_postinst() {
kde5_pkg_postinst
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/, kde-apps/k3b/files/
commit: cae4e3ba3a7dd9507007ba99413974f0c51363f7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 17 18:34:01 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 17 18:58:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae4e3ba
kde-apps/k3b: Drop old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 -
kde-apps/k3b/k3b-17.04.3-r2.ebuild | 120 -
2 files changed, 195 deletions(-)
diff --git a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
deleted file mode 100644
index 83034e74813..000
--- a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001
-From: Leslie Zhai
-Date: Tue, 1 Aug 2017 14:13:05 +0800
-Subject: Fix K3b::Device::from2Byte out-of-bounds issue.
-
-A great bug report by Mark!
-
-BUG: 382941
- libk3bdevice/k3bdeviceglobals.cpp | 24
- tests/k3bdeviceglobalstest.cpp| 4 +++-
- 2 files changed, 15 insertions(+), 13 deletions(-)
-
-diff --git a/libk3bdevice/k3bdeviceglobals.cpp
b/libk3bdevice/k3bdeviceglobals.cpp
-index 090ed29..c016f59 100644
a/libk3bdevice/k3bdeviceglobals.cpp
-+++ b/libk3bdevice/k3bdeviceglobals.cpp
-@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data,
long len )
- }
-
-
--quint16 K3b::Device::from2Byte( const unsigned char* d )
-+quint16 K3b::Device::from2Byte(const unsigned char* d)
- {
--if (d == NULL) {
--qWarning() << "Invalid nullptr!";
-+if (d == NULL || strlen((const char *) d) < 2) {
-+qWarning() << "Invalid Byte!";
- return 0;
- }
--return ( (d[0] << 8 & 0xFF00) |
-- (d[1] & 0xFF) );
-+return ((d[0] << 8 & 0xFF00) |
-+(d[1] & 0xFF));
- }
-
-
--quint32 K3b::Device::from4Byte( const unsigned char* d )
-+quint32 K3b::Device::from4Byte(const unsigned char* d)
- {
--if (d == NULL) {
--qWarning() << "Invalid nullptr!";
-+if (d == NULL || strlen((const char *) d) < 4) {
-+qWarning() << "Invalid Byte!";
- return 0;
- }
--return ( (d[0] << 24 & 0xFF00) |
-- (d[1] << 16 & 0xFF) |
-- (d[2] << 8 & 0xFF00) |
-- (d[3] & 0xFF) );
-+return ((d[0] << 24 & 0xFF00) |
-+(d[1] << 16 & 0xFF) |
-+(d[2] << 8 & 0xFF00) |
-+(d[3] & 0xFF));
- }
-
-
-diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp
-index 307b772..635ee39 100644
a/tests/k3bdeviceglobalstest.cpp
-+++ b/tests/k3bdeviceglobalstest.cpp
-@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest()
-
- void DeviceGlobalsTest::testFrom2Byte()
- {
--const unsigned char* d = NULL;
-+unsigned char* d = NULL;
- QCOMPARE(K3b::Device::from2Byte(d), (quint16)0);
-+unsigned char buf[1] = { '\0' };
-+QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0);
- }
-
- void DeviceGlobalsTest::testFrom4Byte()
---
-cgit v0.11.2
diff --git a/kde-apps/k3b/k3b-17.04.3-r2.ebuild
b/kde-apps/k3b/k3b-17.04.3-r2.ebuild
deleted file mode 100644
index d6448856ec8..000
--- a/kde-apps/k3b/k3b-17.04.3-r2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE
Frameworks"
-HOMEPAGE="http://www.k3b.org/";
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib
vcd vorbis webkit"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kfilemetadata 'taglib?')
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_kdeapps_dep libkcddb)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread )
- ffmpeg? (
- libav? ( media-
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: b1cd661cd6f80d4559817534fda14fa69ec29732
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 12 11:06:48 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Aug 12 11:54:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cd661c
kde-apps/k3b: Restrict tests
One test is failing in case we stabilise this version.
Gentoo-bug: 616880
Package-Manager: Portage-2.3.6, Repoman-2.3.3
kde-apps/k3b/k3b-17.04.3-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
index e0f4fb461bd..3f1a5c8bda0 100644
--- a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
+++ b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
@@ -77,6 +77,8 @@ REQUIRED_USE="
DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+RESTRICT+=" test"
+
src_configure() {
local mycmakeargs=(
-DK3B_BUILD_API_DOCS=OFF
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/files/, kde-apps/k3b/
commit: db551c8e70391cfe960b526704564beb1f31453e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Aug 3 00:39:37 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 3 00:48:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db551c8e
kde-apps/k3b: Fix K3b::Device::from2Byte out-of-bounds issue
See also: https://bugs.kde.org/show_bug.cgi?id=382941
Gentoo-bug: 616880
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 +
kde-apps/k3b/k3b-17.04.3-r2.ebuild | 120 +
2 files changed, 195 insertions(+)
diff --git a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
new file mode 100644
index 000..83034e74813
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch
@@ -0,0 +1,75 @@
+From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001
+From: Leslie Zhai
+Date: Tue, 1 Aug 2017 14:13:05 +0800
+Subject: Fix K3b::Device::from2Byte out-of-bounds issue.
+
+A great bug report by Mark!
+
+BUG: 382941
+---
+ libk3bdevice/k3bdeviceglobals.cpp | 24
+ tests/k3bdeviceglobalstest.cpp| 4 +++-
+ 2 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/libk3bdevice/k3bdeviceglobals.cpp
b/libk3bdevice/k3bdeviceglobals.cpp
+index 090ed29..c016f59 100644
+--- a/libk3bdevice/k3bdeviceglobals.cpp
b/libk3bdevice/k3bdeviceglobals.cpp
+@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data,
long len )
+ }
+
+
+-quint16 K3b::Device::from2Byte( const unsigned char* d )
++quint16 K3b::Device::from2Byte(const unsigned char* d)
+ {
+-if (d == NULL) {
+-qWarning() << "Invalid nullptr!";
++if (d == NULL || strlen((const char *) d) < 2) {
++qWarning() << "Invalid Byte!";
+ return 0;
+ }
+-return ( (d[0] << 8 & 0xFF00) |
+- (d[1] & 0xFF) );
++return ((d[0] << 8 & 0xFF00) |
++(d[1] & 0xFF));
+ }
+
+
+-quint32 K3b::Device::from4Byte( const unsigned char* d )
++quint32 K3b::Device::from4Byte(const unsigned char* d)
+ {
+-if (d == NULL) {
+-qWarning() << "Invalid nullptr!";
++if (d == NULL || strlen((const char *) d) < 4) {
++qWarning() << "Invalid Byte!";
+ return 0;
+ }
+-return ( (d[0] << 24 & 0xFF00) |
+- (d[1] << 16 & 0xFF) |
+- (d[2] << 8 & 0xFF00) |
+- (d[3] & 0xFF) );
++return ((d[0] << 24 & 0xFF00) |
++(d[1] << 16 & 0xFF) |
++(d[2] << 8 & 0xFF00) |
++(d[3] & 0xFF));
+ }
+
+
+diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp
+index 307b772..635ee39 100644
+--- a/tests/k3bdeviceglobalstest.cpp
b/tests/k3bdeviceglobalstest.cpp
+@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest()
+
+ void DeviceGlobalsTest::testFrom2Byte()
+ {
+-const unsigned char* d = NULL;
++unsigned char* d = NULL;
+ QCOMPARE(K3b::Device::from2Byte(d), (quint16)0);
++unsigned char buf[1] = { '\0' };
++QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0);
+ }
+
+ void DeviceGlobalsTest::testFrom4Byte()
+--
+cgit v0.11.2
diff --git a/kde-apps/k3b/k3b-17.04.3-r2.ebuild
b/kde-apps/k3b/k3b-17.04.3-r2.ebuild
new file mode 100644
index 000..d6448856ec8
--- /dev/null
+++ b/kde-apps/k3b/k3b-17.04.3-r2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE
Frameworks"
+HOMEPAGE="http://www.k3b.org/";
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib
vcd vorbis webkit"
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kfilemetadata 'taglib?')
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_kdeapps_dep libkcddb)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ media-l
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: 68972ebcc47ad1025c3900cbe2e62c5836045937
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 2 21:36:56 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 2 21:36:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68972ebc
kde-apps/k3b: Add missing flac REQUIRED_USE
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-apps/k3b/k3b-17.04.3-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
index 845c9aa65ca..e0f4fb461bd 100644
--- a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
+++ b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="${DEPEND}
"
REQUIRED_USE="
+ flac? ( taglib )
mp3? ( encode taglib )
sox? ( encode taglib )
"
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: bd622ea7d3668252369b0f3560df7bf6c89ad390
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 2 21:31:51 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 2 21:32:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd622ea7
kde-apps/k3b: Drop 17.04.3 (r0)
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-apps/k3b/k3b-17.04.3.ebuild | 116
1 file changed, 116 deletions(-)
diff --git a/kde-apps/k3b/k3b-17.04.3.ebuild b/kde-apps/k3b/k3b-17.04.3.ebuild
deleted file mode 100644
index 08c23b934fe..000
--- a/kde-apps/k3b/k3b-17.04.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE
Frameworks"
-HOMEPAGE="http://www.k3b.org/";
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib
vcd vorbis webkit"
-
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kbookmarks)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kfilemetadata)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep knotifyconfig)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep solid)
- $(add_kdeapps_dep libkcddb)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- media-libs/libsamplerate
- dvd? ( media-libs/libdvdread )
- ffmpeg? (
- libav? ( media-video/libav:= )
- !libav? ( media-video/ffmpeg:0= )
- )
- 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/libvorbis )
- webkit? ( $(add_qt_dep qtwebkit) )
-"
-RDEPEND="${DEPEND}
- app-cdr/cdrdao
- dev-libs/libburn
- media-sound/cdparanoia
- virtual/cdrtools
- dvd? (
- >=app-cdr/dvd+rw-tools-7
- encode? ( media-video/transcode[dvd] )
- )
- emovix? ( media-video/emovix )
- sox? ( media-sound/sox )
- vcd? ( media-video/vcdimager )
-"
-
-REQUIRED_USE="
- mp3? ( encode )
- sox? ( encode )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
- local mycmakeargs=(
- -DK3B_BUILD_API_DOCS=OFF
- -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
- -DK3B_ENABLE_HAL_SUPPORT=OFF
- -DK3B_ENABLE_MUSICBRAINZ=OFF
- -DK3B_DEBUG=$(usex debug)
- -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
- -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
- -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
- -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)
- $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
- )
-
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
-
- echo
- elog "If you get warnings on start-up, uncheck the \"Check system"
- elog "configuration\" option in the \"Misc\" settings window."
- echo
-
- 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."
- echo
-}
[gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/
commit: d0166185b0adb7df0a7d22a321751c9f3d646f1f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 2 21:30:59 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 2 21:32:19 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0166185
kde-apps/k3b: Fix USE-deps and REQUIRED_USE
If taglib is not enabled, projects adding mp3 and flac files will hang.
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-apps/k3b/k3b-17.04.3-r1.ebuild | 117 +
1 file changed, 117 insertions(+)
diff --git a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
new file mode 100644
index 000..845c9aa65ca
--- /dev/null
+++ b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE
Frameworks"
+HOMEPAGE="http://www.k3b.org/";
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib
vcd vorbis webkit"
+
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kfilemetadata 'taglib?')
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep knotifyconfig)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_kdeapps_dep libkcddb)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ media-libs/libsamplerate
+ dvd? ( media-libs/libdvdread )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ 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/libvorbis )
+ webkit? ( $(add_qt_dep qtwebkit) )
+"
+RDEPEND="${DEPEND}
+ app-cdr/cdrdao
+ dev-libs/libburn
+ media-sound/cdparanoia
+ virtual/cdrtools
+ dvd? (
+ >=app-cdr/dvd+rw-tools-7
+ encode? ( media-video/transcode[dvd] )
+ )
+ emovix? ( media-video/emovix )
+ sox? ( media-sound/sox )
+ vcd? ( media-video/vcdimager )
+"
+
+REQUIRED_USE="
+ mp3? ( encode taglib )
+ sox? ( encode taglib )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+src_configure() {
+ local mycmakeargs=(
+ -DK3B_BUILD_API_DOCS=OFF
+ -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
+ -DK3B_ENABLE_HAL_SUPPORT=OFF
+ -DK3B_ENABLE_MUSICBRAINZ=OFF
+ -DK3B_DEBUG=$(usex debug)
+ -DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
+ -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
+ -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+ -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)
+ $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ echo
+ elog "If you get warnings on start-up, uncheck the \"Check system"
+ elog "configuration\" option in the \"Misc\" settings window."
+ echo
+
+ 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."
+ echo
+}
