public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/
Date: Thu, 22 Feb 2024 10:09:07 +0000 (UTC)	[thread overview]
Message-ID: <1708596266.cdda2b4470aa4bba18bf1650b4566a8eef3d16c5.asturm@gentoo> (raw)

commit:     cdda2b4470aa4bba18bf1650b4566a8eef3d16c5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 21:51:24 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:04:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdda2b44

kde-apps/dolphin: Fix musl build

Closes: https://bugs.gentoo.org/925195
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/dolphin/dolphin-23.08.5.ebuild           |  2 +
 kde-apps/dolphin/files/dolphin-23.08.5-musl.patch | 64 +++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/kde-apps/dolphin/dolphin-23.08.5.ebuild b/kde-apps/dolphin/dolphin-23.08.5.ebuild
index f253b8e0a372..3116f5e5d438 100644
--- a/kde-apps/dolphin/dolphin-23.08.5.ebuild
+++ b/kde-apps/dolphin/dolphin-23.08.5.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON

diff --git a/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
new file mode 100644
index 000000000000..044a0caef830
--- /dev/null
+++ b/kde-apps/dolphin/files/dolphin-23.08.5-musl.patch
@@ -0,0 +1,64 @@
+From 32a5f1c041d00cdd0246cf7e764a447588f30f3a Mon Sep 17 00:00:00 2001
+From: Bart Ribbers <bribbers@disroot.org>
+Date: Wed, 9 Aug 2023 14:07:46 +0200
+Subject: [PATCH] Fix musl build by using fts_* from external library
+
+musl does not support fts. There is however a standalone package that
+can be used, but it must be linked against. This commit adds a check
+that makes sure to link to the external library if it is required.
+---
+ CMakeLists.txt     | 17 +++++++++++++++++
+ src/CMakeLists.txt |  2 ++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a0b97c635..0a655babb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,6 +27,8 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+ include(ECMQtDeclareLoggingCategory)
+ include(ECMDeprecationSettings)
++include(CheckIncludeFiles)
++include(CheckLibraryExists)
+ 
+ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
+                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
+@@ -150,6 +152,21 @@ else()
+     set(HAVE_TERMINAL TRUE)
+ endif()
+ 
++# Compatibility with platforms without native fts (e.g. musl)
++check_include_files("sys/types.h;sys/stat.h;fts.h" HAVE_FTS_H)
++if(HAVE_FTS_H)
++    check_function_exists(fts_open HAVE_FTS_OPEN)
++    if(NOT HAVE_FTS_OPEN)
++        check_library_exists(fts fts_open "" HAVE_LIB_FTS)
++    endif()
++endif()
++
++if(HAVE_LIB_FTS)
++    set(FTS_LIB fts)
++else()
++    set(FTS_LIB "")
++endif()
++
+ add_subdirectory(src)
+ add_subdirectory(doc)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5a481e39ff..fa7de5cc23 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -213,6 +213,8 @@ target_link_libraries(
+     KF5::WindowSystem
+     KF5::WidgetsAddons
+     KF5::Codecs
++
++    ${FTS_LIB}
+ )
+ 
+ if(HAVE_BALOO)
+-- 
+GitLab
+


             reply	other threads:[~2024-02-22 10:09 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-22 10:09 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-12-14 20:01 [gentoo-commits] repo/gentoo:master commit in: kde-apps/dolphin/, kde-apps/dolphin/files/ Andreas Sturmlechner
2022-02-06 21:17 Andreas Sturmlechner
2021-05-12  8:12 Andreas Sturmlechner
2021-04-04 13:23 Andreas Sturmlechner
2021-01-23  0:25 Andreas Sturmlechner
2020-04-09 21:37 Andreas Sturmlechner
2020-02-15 13:43 Andreas Sturmlechner
2018-11-18  0:17 Andreas Sturmlechner
2015-09-26 15:56 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1708596266.cdda2b4470aa4bba18bf1650b4566a8eef3d16c5.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox