jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

filelight: fix musl

Browse source
This commit is contained in:
John 2018-05-25 01:38:15 +02:00 committed by Enno Boland
parent 7a41e47daf
commit 78a0f28bfc
2 changed files with 54 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
srcpkgs/filelight/patches/musl.patch Normal file
View file

@ -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 <math.h>
-#if !defined(__GLIBC__) || (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
#include <qmath.h>
--- 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 <sys/vfstab.h>
#elif !defined(Q_OS_WIN)
+#ifdef __GLIBC__
#include <fstab.h>
#endif
+#endif
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
--- 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 <math.h>
-
-#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 1)
-
-#include <qmath.h>
-
-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

6
srcpkgs/filelight/template
View file

@ -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