gentoo auto-resync : 17:07:2022 - 14:31:38

3 files changed, 98 insertions, 1 deletions

diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 8613eb59a2c1..03405acd3872 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,6 @@
+AUX k3b-22.04.3-fstab_h-musl.patch 3003 BLAKE2B 08a7c1104b518310bd91133a2e4c54cf2203251201632aea8346fb03cf5370a9a59570f0c1e37f3013dcb788f2f3c4c6e949fed162c6b4e061c42d01e47afb3c SHA512 5b1564614e00a33830ee4340d382560e2fef069d490f9db2c6aa99f8344a5032e42b6dcf814bf8139d71a640848deee3c4c6d0f11f25cf7604e7cb4bec47fb0d
 DIST k3b-21.12.3.tar.xz 10750308 BLAKE2B 91eca50b238dee12af13547127fb329d4f2b3b4f77119ffb6d9b1e7bd321ac945a4f53ae58ce34310db9c7dea2b3a95225b4ea11a5b930cff69b799a7cd57d38 SHA512 11bb2b16a90eba4bd33fceac84fc0d26dc36ca3b643ff0f672ab8aa9e6def0e79fdd8bb24d68764066bb05538d13f3bb30f7c40c92b35224f45876a796c3b951
 DIST k3b-22.04.3.tar.xz 10745764 BLAKE2B 9418fbd782402d5b315345efbf4d0862b605926a9298eba0f1463d79e6a595456924c8c4fb139fed347ed583f44f67ad55227f5d795b65af4a8311b90c420ea1 SHA512 90c30ab34478565a70d15f49d20501577cdf741084e6f253b9dd9d040867a536d4e14d1d84406ff72dc00d9cfad5ea7210ebc8c61fcde37359147d791079f066
 EBUILD k3b-21.12.3.ebuild 3377 BLAKE2B 48f23f13cfaabae7d93e0a7c53efe48e1324480562075a5a1c3168af6ae66d6c936910a65993ddeb9d11a5418e8c00a60c0ad7380b1aacb298c0637efcdd79c3 SHA512 947036cd9165c54e30b9ad8549a90b5f437f8354810bd045acd4a8ea78b2f571ff9de69585be8cf5d306cc4eda5f359a367ec56737113da7276cc89f86fb7a5a
-EBUILD k3b-22.04.3.ebuild 3345 BLAKE2B bb12f876279cfd7d7509cebb2045c8ac23a693dddab7e7d46d6bd7ba6edd4fd9740b31e129e69e1de73d968a04d5da0fa59ec54261ccd8a3a396c1e53982cd49 SHA512 e41374028806658a43e736cdb06aeee645d8d39eeae93356aaff47e4961416cc30ad929624de661a4548937a69fd89434352f00452e439e9032f1909b25c078f
+EBUILD k3b-22.04.3.ebuild 3406 BLAKE2B 5504389efeca245c940b8c936da51b89f8c17c90396ae021f1f7ec5a199a074917c281a41fffdf7f2f7bcf9444c293b7b817162f822ec912cc1efc72726baf50 SHA512 3785fb7712fa36087f5ecff0edeca0e9501210f75122fa8fb9031470ab6b2dc08c3979f2cd0e0abb8a81b16f04fb91b635f9b2b2c0c89085fec562611070d139
 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
new file mode 100644
index 000000000000..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 <cat@catcream.org>
+Date: Thu, 14 Jul 2022 21:07:32 +0200
+Subject: [PATCH] k3bsystemproblemdialog.cpp: Check for HAVE_FSTAB_H
+
+Signed-off-by: Alfred Persson Forsberg <cat@catcream.org>
+---
+ 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 <langinfo.h>
+ #endif
+ 
+-#ifndef Q_OS_WIN32
++#ifdef HAVE_FSTAB_H
+ #include <fstab.h>
+ #endif
+ #include <unistd.h>
+@@ -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<K3b::Device::Device*> automountedDevices = checkForAutomounting();
+     for( QList<K3b::Device::Device *>::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::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
+ {
+     QList<K3b::Device::Device *> 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 <cat@catcream.org>
+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 <cat@catcream.org>
+---
+ 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