Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 8 additions & 19 deletions srcpkgs/ardour/patches/0001-Unset-HAVE_GNU_FTW.patch
Original file line number Diff line number Diff line change
@@ -1,40 +1,29 @@
From 23d48d140720dfba8553616a2c27caf2b2166aff Mon Sep 17 00:00:00 2001

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leave this header, it's useful context

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or at least add a similar comment explaining why the patch is needed

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I regenerated the patch myself, so the header was removed. I'll add a comment back explaining the reason.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't add a comment, leave the original header. When you rebase a patch like that, you should still preserve the original provenance for proper attribution.

From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Thu, 18 Jul 2024 23:44:34 +0200
Subject: [PATCH] Unset HAVE_GNU_FTW

Don't assume we have GNU_FTW on Alpine.
# Don't assume we have GNU_FTW on musl-based systems.
# Let the build system detect whether it is available.
---
libs/tk/ydk/config.h | 2 --
libs/tk/ytk/config.h | 2 --
2 files changed, 4 deletions(-)

diff --git a/libs/tk/ydk/config.h b/libs/tk/ydk/config.h
index d933837df2..009d3303bf 100644
index 484758b..7ee1d55 100644
--- a/libs/tk/ydk/config.h
+++ b/libs/tk/ydk/config.h
@@ -26,8 +26,6 @@
@@ -28,8 +28,6 @@
#endif

#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__NetBSD__)
-/* Have GNU ftw */
-#define HAVE_GNU_FTW 1
#endif

/* Define to 1 if ipc.h is available */
diff --git a/libs/tk/ytk/config.h b/libs/tk/ytk/config.h
index f9991eee10..9f09e8d88a 100644
index 7f648aa..3ecadb3 100644
--- a/libs/tk/ytk/config.h
+++ b/libs/tk/ytk/config.h
@@ -23,8 +23,6 @@
@@ -31,8 +31,6 @@
#endif

#ifndef __APPLE__
#if !defined(__APPLE__) && !defined(__NetBSD__)
-/* Have GNU ftw */
-#define HAVE_GNU_FTW 1
#endif

/* Define to 1 if ipc.h is available */
--
2.45.2

6 changes: 3 additions & 3 deletions srcpkgs/ardour/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'ardour'
pkgname=ardour
version=8.12
revision=4
version=9.7
revision=1
build_style=waf3
configure_args="--cxx17 --no-phone-home --with-backends=jack,alsa,dummy
--configdir=/etc
Expand All @@ -21,7 +21,7 @@ homepage="http://ardour.org"

CXXFLAGS="-fpermissive"
export PATH="/usr/libexec/chroot-git:$PATH"
conf_files="/etc/ardour8/*"
conf_files="/etc/ardour9/*"

case "$XBPS_TARGET_MACHINE" in
x86_64*) configure_args+=" --dist-target=x86_64" ;;
Expand Down