aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2022-07-15 10:32:49 +0200
committerBart Ribbers <bribbers@disroot.org>2022-07-15 09:28:15 +0000
commit3d58e4998d4a5e97355578921fa83f41343b9728 (patch)
tree0d0053d07ea03a1c992051418ef7e05d9003ba15
parent2a57681043b85524584f09a16bf1bfe1f5d8d2d8 (diff)
downloadaports-3d58e4998d4a5e97355578921fa83f41343b9728.tar.gz
aports-3d58e4998d4a5e97355578921fa83f41343b9728.tar.bz2
aports-3d58e4998d4a5e97355578921fa83f41343b9728.tar.xz
community/k3b: change musl build fix for the merged upstream version
-rw-r--r--community/k3b/0001-Disable-glibc-specific-feature.patch31
-rw-r--r--community/k3b/0001-Fix-build-on-musl-HAVE_FSTAB_H.patch83
-rw-r--r--community/k3b/APKBUILD6
3 files changed, 86 insertions, 34 deletions
diff --git a/community/k3b/0001-Disable-glibc-specific-feature.patch b/community/k3b/0001-Disable-glibc-specific-feature.patch
deleted file mode 100644
index 27fb51c33b..0000000000
--- a/community/k3b/0001-Disable-glibc-specific-feature.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
-index 3881eba38..2b818a85c 100644
---- a/src/k3bsystemproblemdialog.cpp
-+++ b/src/k3bsystemproblemdialog.cpp
-@@ -49,7 +49,7 @@
- #include <langinfo.h>
- #endif
-
--#ifndef Q_OS_WIN32
-+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)
- #include <fstab.h>
- #endif
- #include <unistd.h>
-@@ -386,7 +386,7 @@ void K3b::SystemProblemDialog::checkSystem(QWidget* parent, NotificationLevel le
- dvd_r_dl = true;
- }
-
--#ifndef Q_OS_WIN32
-+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)
- // check automounted devices
- QList<K3b::Device::Device*> automountedDevices = checkForAutomounting();
- for( QList<K3b::Device::Device *>::const_iterator it = automountedDevices.constBegin();
-@@ -673,7 +673,7 @@ int K3b::SystemProblemDialog::dmaActivated( K3b::Device::Device* dev )
- }
-
-
--#ifndef Q_OS_WIN32
-+#if (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)
- QList<K3b::Device::Device*> K3b::SystemProblemDialog::checkForAutomounting()
- {
- QList<K3b::Device::Device *> l;
diff --git a/community/k3b/0001-Fix-build-on-musl-HAVE_FSTAB_H.patch b/community/k3b/0001-Fix-build-on-musl-HAVE_FSTAB_H.patch
new file mode 100644
index 0000000000..369abecef2
--- /dev/null
+++ b/community/k3b/0001-Fix-build-on-musl-HAVE_FSTAB_H.patch
@@ -0,0 +1,83 @@
+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 1/2] 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
+
+
+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 2/2] 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
+
diff --git a/community/k3b/APKBUILD b/community/k3b/APKBUILD
index 6eeb27e75c..0411e4a412 100644
--- a/community/k3b/APKBUILD
+++ b/community/k3b/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=k3b
pkgver=22.04.3
-pkgrel=0
+pkgrel=1
# armhf blocked by extra-cmake-modules
# s390x and riscv64 blocked by polkit -> kio
arch="all !armhf !s390x !riscv64"
@@ -47,7 +47,7 @@ makedepends="
taglib-dev
"
source="https://download.kde.org/stable/release-service/$pkgver/src/k3b-$pkgver.tar.xz
- 0001-Disable-glibc-specific-feature.patch
+ 0001-Fix-build-on-musl-HAVE_FSTAB_H.patch
"
subpackages="$pkgname-doc $pkgname-lang"
@@ -73,5 +73,5 @@ package() {
sha512sums="
90c30ab34478565a70d15f49d20501577cdf741084e6f253b9dd9d040867a536d4e14d1d84406ff72dc00d9cfad5ea7210ebc8c61fcde37359147d791079f066 k3b-22.04.3.tar.xz
-941f1ee3eb7024642b8c93994741bc53c56a0d85b4284a10c04208b8037987e1fa6d568b909f332fda33303084c6d35f2ab35df1033d708c06edecb56cf9645e 0001-Disable-glibc-specific-feature.patch
+419f8f6727d6ae9285a494e025a068751c1780070ad119659a8a58d7b273bba1eb68282a6b1d40fab1cd3297679f99ded09959126e3ae5364d09119e32880c20 0001-Fix-build-on-musl-HAVE_FSTAB_H.patch
"