From 6160dd8ee38a7e8ccd66b7b073a4936dd0937268 Mon Sep 17 00:00:00 2001 From: inference Date: Tue, 3 Jan 2023 20:37:02 +0000 Subject: [PATCH] Remove sys-libs/musl fix-pamalloc patch since Chromium is no longer used on this system and musl no longer requires patching for it. --- .../media-libs/libopenshot-audio/juce_core.cpp | 1 - .../media-libs/libopenshot-audio/juce_core.patch | 12 ++++++++++++ portage/patches/sys-libs/musl/fix-pamalloc.patch | 14 -------------- 3 files changed, 12 insertions(+), 15 deletions(-) create mode 100644 portage/patches/media-libs/libopenshot-audio/juce_core.patch delete mode 100644 portage/patches/sys-libs/musl/fix-pamalloc.patch diff --git a/portage/patches/media-libs/libopenshot-audio/juce_core.cpp b/portage/patches/media-libs/libopenshot-audio/juce_core.cpp index 8bac812..868a2ff 100644 --- a/portage/patches/media-libs/libopenshot-audio/juce_core.cpp +++ b/portage/patches/media-libs/libopenshot-audio/juce_core.cpp @@ -93,7 +93,6 @@ #include #if ! JUCE_ANDROID - #include #endif #endif diff --git a/portage/patches/media-libs/libopenshot-audio/juce_core.patch b/portage/patches/media-libs/libopenshot-audio/juce_core.patch new file mode 100644 index 0000000..94c5496 --- /dev/null +++ b/portage/patches/media-libs/libopenshot-audio/juce_core.patch @@ -0,0 +1,12 @@ +diff --git a/portage/patches/media-libs/libopenshot-audio/juce_core.cpp b/portage/patches/media-libs/libopenshot-audio/juce_core.cpp +index 8bac812..868a2ff 100644 +--- a/JuceLibraryCode/modules/juce_core/juce_core.cpp ++++ b/JuceLibraryCode/modules/juce_core/juce_core.cpp +@@ -93,7 +93,6 @@ + #include + + #if ! JUCE_ANDROID +- #include + #endif + #endif + diff --git a/portage/patches/sys-libs/musl/fix-pamalloc.patch b/portage/patches/sys-libs/musl/fix-pamalloc.patch deleted file mode 100644 index 2d25eaf..0000000 --- a/portage/patches/sys-libs/musl/fix-pamalloc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/thread/pthread_atfork.c b/src/thread/pthread_atfork.c -index 76497401..f4e2cf7e 100644 ---- a/src/thread/pthread_atfork.c -+++ b/src/thread/pthread_atfork.c -@@ -2,6 +2,8 @@ - #include "libc.h" - #include "lock.h" - -+#define malloc __libc_malloc -+ - static struct atfork_funcs { - void (*prepare)(void); - void (*parent)(void); -