[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/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
