From 78a0f28bfc8537c4233e02f2d53d31c7b9a6fd5c Mon Sep 17 00:00:00 2001 From: John Date: Fri, 25 May 2018 01:38:15 +0200 Subject: [PATCH] filelight: fix musl --- srcpkgs/filelight/patches/musl.patch | 54 ++++++++++++++++++++++++++++ srcpkgs/filelight/template | 6 ---- 2 files changed, 54 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/filelight/patches/musl.patch diff --git a/srcpkgs/filelight/patches/musl.patch b/srcpkgs/filelight/patches/musl.patch new file mode 100644 index 0000000000..7c0252b649 --- /dev/null +++ b/srcpkgs/filelight/patches/musl.patch @@ -0,0 +1,54 @@ +--- src/radialMap/sincos.h 2018-05-06 06:10:38.000000000 +0200 ++++ - 2018-05-25 01:24:06.234265312 +0200 +@@ -21,10 +21,10 @@ + + #ifndef SINCOS_H + #define SINCOS_H +- ++#define _GNU_SOURCE + #include + +-#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) ++#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) + + #include + +--- src/localLister.cpp 2018-05-06 06:10:38.000000000 +0200 ++++ - 2018-05-25 01:33:28.202631988 +0200 +@@ -35,8 +35,10 @@ + #ifdef Q_OS_SOLARIS + #include + #elif !defined(Q_OS_WIN) ++#ifdef __GLIBC__ + #include + #endif ++#endif + #include + #include + #include +--- src/radialMap/sincos.h 2018-05-25 01:30:46.775385798 +0200 ++++ - 2018-05-25 01:34:59.788609200 +0200 +@@ -23,23 +23,4 @@ + #define SINCOS_H + #define _GNU_SOURCE + #include +- +-#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1) +- +-#include +- +-void +-sincos(double angleRadians, double *Sin, double *Cos); +- +-#ifdef SINCOS_H_IMPLEMENTATION +-void +-sincos(double angleRadians, double *Sin, double *Cos) +-{ +- *Sin = qSin(angleRadians); +- *Cos = qCos(angleRadians); +-} +-#endif +- +-#endif +- + #endif diff --git a/srcpkgs/filelight/template b/srcpkgs/filelight/template index 760c792b2a..946c8c28f4 100644 --- a/srcpkgs/filelight/template +++ b/srcpkgs/filelight/template @@ -15,9 +15,3 @@ checksum=5a197d16b36b04eafd53385e7f50ac31930953ac8ad8ae021c02953a064926f0 if [ -n "$CROSS_BUILD" ]; then hostmakedepends+=" kconfig kdoctools python qt5-host-tools qt5-qmake" fi - -case "$XBPS_TARGET_MACHINE" in - *-musl) - # missing fstab.h - broken="https://travis-ci.org/voidlinux/void-packages/jobs/339621627" ;; -esac