From fd388b53035add95b3b3c3121fb9c62a6b642353 Mon Sep 17 00:00:00 2001 From: Denis Kozadaev Date: Thu, 30 Jan 2020 22:13:12 +0300 Subject: DilOS: tdeedu build pack Signed-off-by: Denis Kozadaev --- dilos/tdeedu/debian/patches/dilos.patch | 76 +++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 dilos/tdeedu/debian/patches/dilos.patch (limited to 'dilos/tdeedu/debian/patches/dilos.patch') diff --git a/dilos/tdeedu/debian/patches/dilos.patch b/dilos/tdeedu/debian/patches/dilos.patch new file mode 100644 index 000000000..9becb70e3 --- /dev/null +++ b/dilos/tdeedu/debian/patches/dilos.patch @@ -0,0 +1,76 @@ +Index: tdeedu/kig/misc/conic-common.cpp +=================================================================== +--- tdeedu.orig/kig/misc/conic-common.cpp ++++ tdeedu/kig/misc/conic-common.cpp +@@ -28,7 +28,7 @@ + #include + #include + +-#ifdef HAVE_IEEEFP_H ++#if defined(HAVE_IEEEFP_H) || defined(__dilos__) + #include + #endif + +Index: tdeedu/cmake/modules/TDEMacros.cmake +=================================================================== +--- tdeedu.orig/cmake/modules/TDEMacros.cmake ++++ tdeedu/cmake/modules/TDEMacros.cmake +@@ -833,7 +833,7 @@ macro( tde_add_library _arg_target ) + + # set embedded archives + if( _embed ) +- list( INSERT _link 0 -Wl,-whole-archive ${_embed} -Wl,-no-whole-archive ) ++ list( INSERT _link 0 -Wl,-zallextract ${_embed} -Wl,-zdefaultextract ) + endif( _embed ) + + # set link libraries +Index: tdeedu/kstars/kstars/indi/apogee/ApogeeLinux.h +=================================================================== +--- tdeedu.orig/kstars/kstars/indi/apogee/ApogeeLinux.h ++++ tdeedu/kstars/kstars/indi/apogee/ApogeeLinux.h +@@ -10,6 +10,10 @@ + #ifndef APOGEELINUX_H + #define APOGEELINUX_H + ++#ifdef __dilos__ ++#include ++#endif /* __dilos__ */ ++ + #define APISA_READ_USHORT _IOR('a', 0x01, unsigned int) + #define APISA_READ_LINE _IOR('a', 0x02, unsigned int) + #define APISA_WRITE_USHORT _IOW('a', 0x03, unsigned int) +Index: tdeedu/kstars/kstars/indi/apogee/ApnCamera.h +=================================================================== +--- tdeedu.orig/kstars/kstars/indi/apogee/ApnCamera.h ++++ tdeedu/kstars/kstars/indi/apogee/ApnCamera.h +@@ -13,6 +13,17 @@ + #if !defined(AFX_APNCAMERA_H__CF513996_359F_4103_BBA6_2C730AE2C301__INCLUDED_) + #define AFX_APNCAMERA_H__CF513996_359F_4103_BBA6_2C730AE2C301__INCLUDED_ + ++#ifdef __dilos__ ++#include ++#include ++#include ++#include ++#define ULONG ulong ++#define USHORT ushort ++#define PUSHORT short unsigned int * ++#define Sleep sleep ++#endif /*__dilos__ */ ++ + #include "Apogee.h" + #include "Apn.h" + #include "FpgaRegs.h" +Index: tdeedu/kig/misc/cubic-common.cc +=================================================================== +--- tdeedu.orig/kig/misc/cubic-common.cc ++++ tdeedu/kig/misc/cubic-common.cc +@@ -21,7 +21,7 @@ + #include "kignumerics.h" + #include "kigtransform.h" + +-#ifdef HAVE_IEEEFP_H ++#if defined(HAVE_IEEEFP_H) || defined(__dilos__) + #include + #endif + -- cgit v1.2.1