Pathes for build SALOME third-patry products

diff --git a/config/patches/occt/README b/config/patches/occt/README
new file mode 100644 (file)
index 0000000..0a0ede4
--- /dev/null
+++ b/config/patches/occt/README
@@ -0,0 +1,37 @@
+This directory containes patches needed to build SALOME pre-requisites at OCCT side.
+
+Comments
+========
+
+1. freeimage
+   - freeimage.001_sources.patch : patch to add missing defines
+   - freeimage.002_build_procedure.patch : patch to correct installation procedure
+   - freeimage.003_gcc47_compat.patch : patch to build freeimage with gcc 4.7 version
+   - freeimage.004_gcc66.patch : patch to build freeimage with gcc 6 version
+
+2. graphvis
+   - graphviz.001_build_procedure.patch : correct a mistake in the configure script
+   ! Additional patch is applied to binaries installation of grapvis to correct config6 via sed utility
+
+3. qt
+   - qt.001_proxy_factory.patch : fix a problem with compilation of QNetworkProxy
+   - qt.002_disable_qtgamepad.patch : disable qtgamepad package on CentOS-6.4 ONLY!
+
+4. scotch
+   - scotch.001.create_makefile.patch : patch to create proper Makefile
+
+5. solvespace 
+   - solvespace.001_nogui.patch : patch to build solvespace without GUI
+
+6. gl2ps
+   - gl2ps.001_libs.patch : patch to add missing link libraries
+
+7. qwt
+   ! Patch which contains hardcoded path to qwt install directory is applied via sed utility. It is impossible to create such a patch using diff syntax.
+
+8. hdf5
+   - hdf5.001_threads_threads.patch : fix problem with Threads::Threads library for CMake build procedure
+
+9. omniorb
+   ! Patch is applied to installed omniorb in order to set correct path to python3 executable
+

diff --git a/config/patches/occt/freeimage.001_sources.patch b/config/patches/occt/freeimage.001_sources.patch
new file mode 100644 (file)
index 0000000..8bf79df
--- /dev/null
+++ b/config/patches/occt/freeimage.001_sources.patch
@@ -0,0 +1,25 @@
+diff -Naur --exclude=CVS freeimage-3.16.0_orig/Source/LibWebP/src/utils/bit_writer.c freeimage-3.16.0_patch/Source/LibWebP/src/utils/bit_writer.c
+--- freeimage-3.16.0_orig/Source/LibWebP/src/utils/bit_writer.c
++++ freeimage-3.16.0_patch/Source/LibWebP/src/utils/bit_writer.c
+@@ -226,6 +226,21 @@
+ #define htole16(x) (x)\r
+ #else     // pretty much all linux and/or glibc\r
+ #include <endian.h>\r
++#if !defined(htole32)
++# include <byteswap.h>
++# ifdef __USE_BSD
++/* Conversion interfaces.  */
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#define htole16(x) (x)
++#define htole32(x) (x)
++#define htole64(x) (x)
++#else
++#define htole16(x) __bswap_16 (x)
++#define htole32(x) __bswap_32 (x)
++#define htole64(x) __bswap_64 (x)
++#endif
++#endif
++#endif
+ #endif\r
+ \r
+ // Returns 1 on success.\r

diff --git a/config/patches/occt/freeimage.002_build_procedure.patch b/config/patches/occt/freeimage.002_build_procedure.patch
new file mode 100644 (file)
index 0000000..bcbaad3
--- /dev/null
+++ b/config/patches/occt/freeimage.002_build_procedure.patch
@@ -0,0 +1,62 @@
+diff -NaurwB freeimage-3.16.0__0/Makefile.fip freeimage-3.16.0__1/Makefile.fip
+--- freeimage-3.16.0__0/Makefile.fip   2014-03-15 19:35:28.000000000 +0400
++++ freeimage-3.16.0__1/Makefile.fip   2017-03-15 15:05:20.396869687 +0300
+@@ -4,9 +4,9 @@
+ include fipMakefile.srcs\r
+ \r
+ # General configuration variables:\r
+-DESTDIR ?= /\r
+-INCDIR ?= $(DESTDIR)/usr/include\r
+-INSTALLDIR ?= $(DESTDIR)/usr/lib\r
++DESTDIR ?= /usr\r
++INCDIR ?= $(DESTDIR)/include\r
++INSTALLDIR ?= $(DESTDIR)/lib\r
+ \r
+ # Converts cr/lf to just lf\r
+ DOS2UNIX = dos2unix\r
+@@ -71,10 +71,12 @@
+ \r
+ install:\r
+       install -d $(INCDIR) $(INSTALLDIR)\r
+-      install -m 644 -o root -g root $(HEADER) $(INCDIR)\r
+-      install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)\r
+-      install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)\r
+-      install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)\r
++      install -m 644 $(HEADER) $(INCDIR)\r
++      install -m 644 $(HEADERFIP) $(INCDIR)\r
++      install -m 644 $(STATICLIB) $(INSTALLDIR)\r
++      install -m 755 $(SHAREDLIB) $(INSTALLDIR)
++      ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
++      ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)\r
+ \r
+ clean:\r
+       rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)\r
+diff -NaurwB freeimage-3.16.0__0/Makefile.gnu freeimage-3.16.0__1/Makefile.gnu
+--- freeimage-3.16.0__0/Makefile.gnu   2014-03-16 00:02:08.000000000 +0400
++++ freeimage-3.16.0__1/Makefile.gnu   2017-03-15 15:05:20.384869623 +0300
+@@ -4,9 +4,9 @@
+ include Makefile.srcs\r
+ \r
+ # General configuration variables:\r
+-DESTDIR ?= /\r
+-INCDIR ?= $(DESTDIR)/usr/include\r
+-INSTALLDIR ?= $(DESTDIR)/usr/lib\r
++DESTDIR ?= /usr\r
++INCDIR ?= $(DESTDIR)/include\r
++INSTALLDIR ?= $(DESTDIR)/lib\r
+ \r
+ # Converts cr/lf to just lf\r
+ DOS2UNIX = dos2unix\r
+@@ -70,9 +70,9 @@
+ \r
+ install:\r
+       install -d $(INCDIR) $(INSTALLDIR)\r
+-      install -m 644 -o root -g root $(HEADER) $(INCDIR)\r
+-      install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)\r
+-      install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)\r
++      install -m 644 $(HEADER) $(INCDIR)\r
++      install -m 644 $(STATICLIB) $(INSTALLDIR)\r
++      install -m 755 $(SHAREDLIB) $(INSTALLDIR)\r
+       ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)\r
+       ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)   \r
+ #     ldconfig\r

diff --git a/config/patches/occt/freeimage.003_gcc47_compat.patch b/config/patches/occt/freeimage.003_gcc47_compat.patch
new file mode 100644 (file)
index 0000000..516a499
--- /dev/null
+++ b/config/patches/occt/freeimage.003_gcc47_compat.patch
@@ -0,0 +1,11 @@
+diff -NaurwB freeimage-3.16.0__0/Source/OpenEXR/IlmImf/ImfAutoArray.h freeimage-3.16.0__1/Source/OpenEXR/IlmImf/ImfAutoArray.h
+--- freeimage-3.16.0__0/Source/OpenEXR/IlmImf/ImfAutoArray.h   2014-03-08 01:31:08.000000000 +0400
++++ freeimage-3.16.0__1/Source/OpenEXR/IlmImf/ImfAutoArray.h   2017-03-15 14:10:35.682298047 +0300
+@@ -45,6 +45,7 @@
+ //-----------------------------------------------------------------------------
+ 
+ #include "OpenEXRConfig.h"
++#include <string.h>
+ #if !defined(_WIN32) || defined(__MINGW32__)
+ // needed for memset
+ #include <string.h>

diff --git a/config/patches/occt/freeimage.004_gcc66.patch b/config/patches/occt/freeimage.004_gcc66.patch
new file mode 100644 (file)
index 0000000..614a853
--- /dev/null
+++ b/config/patches/occt/freeimage.004_gcc66.patch
@@ -0,0 +1,71 @@
+diff -Naur freeimage-3.16.0_SRC_orig/Source/LibRawLite/dcraw/dcraw.c freeimage-3.16.0_SRC_patched/Source/LibRawLite/dcraw/dcraw.c
+--- freeimage-3.16.0_SRC_orig/Source/LibRawLite/dcraw/dcraw.c  2014-02-07 23:48:10.000000000 +0400
++++ freeimage-3.16.0_SRC_patched/Source/LibRawLite/dcraw/dcraw.c       2016-10-14 12:05:37.481253676 +0300
+@@ -4072,22 +4072,22 @@
+     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,\r
+     -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,\r
+     -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,\r
+-    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,\r
+-    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,\r
++    -1,-2,-1,+0,0,(signed char)0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,\r
++    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char)0x88, -1,-1,+1,-2,0,0x40,\r
+     -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,\r
+     -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,\r
+     -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,\r
+     -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,\r
+     -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,\r
+     -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,\r
+-    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,\r
++    +0,-2,+0,+0,1,(signed char)0x80, +0,-1,+0,+1,1,(signed char)0x88, +0,-1,+1,-2,0,0x40,\r
+     +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,\r
+     +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,\r
+     +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,\r
+     +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,\r
+     +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,\r
+-    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,\r
+-    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,\r
++    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char)0x80,\r
++    +1,-1,+1,+1,0,(signed char)0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,\r
+     +1,+0,+2,+1,0,0x10\r
+   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };\r
+   ushort (*brow[5])[4], *pix;\r
+diff -Naur freeimage-3.16.0_SRC_orig/Source/LibRawLite/internal/dcraw_common.cpp freeimage-3.16.0_SRC_patched/Source/LibRawLite/internal/dcraw_common.cpp
+--- freeimage-3.16.0_SRC_orig/Source/LibRawLite/internal/dcraw_common.cpp      2014-02-07 23:48:10.000000000 +0400
++++ freeimage-3.16.0_SRC_patched/Source/LibRawLite/internal/dcraw_common.cpp   2016-10-14 12:06:27.540395171 +0300
+@@ -3782,22 +3782,22 @@
+     -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03,\r
+     -2,+1,-1,+0,0,0x04, -2,+1,+0,-1,1,0x04, -2,+1,+0,+0,0,0x06,\r
+     -2,+1,+0,+1,0,0x02, -2,+2,+0,+0,1,0x04, -2,+2,+0,+1,0,0x04,\r
+-    -1,-2,-1,+0,0,0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,\r
+-    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,0x88, -1,-1,+1,-2,0,0x40,\r
++    -1,-2,-1,+0,0,(signed char)0x80, -1,-2,+0,-1,0,0x01, -1,-2,+1,-1,0,0x01,\r
++    -1,-2,+1,+0,1,0x01, -1,-1,-1,+1,0,(signed char)0x88, -1,-1,+1,-2,0,0x40,\r
+     -1,-1,+1,-1,0,0x22, -1,-1,+1,+0,0,0x33, -1,-1,+1,+1,1,0x11,\r
+     -1,+0,-1,+2,0,0x08, -1,+0,+0,-1,0,0x44, -1,+0,+0,+1,0,0x11,\r
+     -1,+0,+1,-2,1,0x40, -1,+0,+1,-1,0,0x66, -1,+0,+1,+0,1,0x22,\r
+     -1,+0,+1,+1,0,0x33, -1,+0,+1,+2,1,0x10, -1,+1,+1,-1,1,0x44,\r
+     -1,+1,+1,+0,0,0x66, -1,+1,+1,+1,0,0x22, -1,+1,+1,+2,0,0x10,\r
+     -1,+2,+0,+1,0,0x04, -1,+2,+1,+0,1,0x04, -1,+2,+1,+1,0,0x04,\r
+-    +0,-2,+0,+0,1,0x80, +0,-1,+0,+1,1,0x88, +0,-1,+1,-2,0,0x40,\r
++    +0,-2,+0,+0,1,(signed char)0x80, +0,-1,+0,+1,1,(signed char)0x88, +0,-1,+1,-2,0,0x40,\r
+     +0,-1,+1,+0,0,0x11, +0,-1,+2,-2,0,0x40, +0,-1,+2,-1,0,0x20,\r
+     +0,-1,+2,+0,0,0x30, +0,-1,+2,+1,1,0x10, +0,+0,+0,+2,1,0x08,\r
+     +0,+0,+2,-2,1,0x40, +0,+0,+2,-1,0,0x60, +0,+0,+2,+0,1,0x20,\r
+     +0,+0,+2,+1,0,0x30, +0,+0,+2,+2,1,0x10, +0,+1,+1,+0,0,0x44,\r
+     +0,+1,+1,+2,0,0x10, +0,+1,+2,-1,1,0x40, +0,+1,+2,+0,0,0x60,\r
+-    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,0x80,\r
+-    +1,-1,+1,+1,0,0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,\r
++    +0,+1,+2,+1,0,0x20, +0,+1,+2,+2,0,0x10, +1,-2,+1,+0,0,(signed char)0x80,\r
++    +1,-1,+1,+1,0,(signed char)0x88, +1,+0,+1,+2,0,0x08, +1,+0,+2,-1,0,0x40,\r
+     +1,+0,+2,+1,0,0x10\r
+   }, chood[] = { -1,-1, -1,0, -1,+1, 0,+1, +1,+1, +1,0, +1,-1, 0,-1 };\r
+   ushort (*brow[5])[4], *pix;\r
+@@ -7380,7 +7380,7 @@
+       { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },\r
+     { "Phase One P65", 0, 0,\r
+       { 8035,435,-962,-6001,13872,2320,-1159,3065,5434 } },\r
+-    { "Red One", 704, 0xffff,         /* DJC */\r
++    { "Red One", 704, (short int)0xffff,              /* DJC */\r
+       { 21014,-7891,-2613,-3056,12201,856,-2203,5125,8042 } },\r
+     { "Samsung EK-GN120", 0, 0, /* Adobe; Galaxy NX */\r
+         { 7557,-2522,-739,-4679,12949,1894,-840,1777,5311 } },\r

diff --git a/config/patches/occt/gl2ps.001_libs.patch b/config/patches/occt/gl2ps.001_libs.patch
new file mode 100644 (file)
index 0000000..68168b3
--- /dev/null
+++ b/config/patches/occt/gl2ps.001_libs.patch
@@ -0,0 +1,13 @@
+diff -NaurwB gl2ps-1.3.9__1/CMakeLists.txt gl2ps-1.3.9__0/CMakeLists.txt
+--- gl2ps-1.3.9__1/CMakeLists.txt      2017-03-15 14:16:29.548325553 +0300
++++ gl2ps-1.3.9__0/CMakeLists.txt      2017-03-15 14:17:13.060574241 +0300
+@@ -76,6 +76,9 @@
+   add_definitions(-DHAVE_NO_VSNPRINTF)
+ endif(NOT HAVE_VSNPRINTF)
+ 
++find_library(LIBM_LIBRARY NAMES m)
++list(APPEND EXTERNAL_LIBRARIES ${LIBM_LIBRARY})
++
+ find_package(OpenGL)
+ if(OPENGL_FOUND)
+   list(APPEND EXTERNAL_INCLUDES ${OPENGL_INCLUDE_DIR})

diff --git a/config/patches/occt/graphviz.001_build_procedure.patch b/config/patches/occt/graphviz.001_build_procedure.patch
new file mode 100644 (file)
index 0000000..ede5edd
--- /dev/null
+++ b/config/patches/occt/graphviz.001_build_procedure.patch
@@ -0,0 +1,21 @@
+diff -NaurwB graphviz-2.38.0__1/configure graphviz-2.38.0__0/configure
+--- graphviz-2.38.0__0/configure       2017-03-15 14:22:15.286297951 +0300
++++ graphviz-2.38.0__1/configure       2017-03-15 14:23:12.054621051 +0300
+@@ -22415,7 +22415,7 @@
+       else
+         PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`
+         PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
+-        PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
++        PYTHON_LIBS="-L$PYTHON_PREFIX/lib -lpython$PYTHON_VERSION_SHORT"
+         PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
+         save_CPPFLAGS=$CPPFLAGS
+         CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+@@ -23797,7 +23797,7 @@
+ fi
+ 
+ if test "x$use_tcl" = "x"; then
+-  TCL_VERSION_FOUND=`echo 'puts [info tclversion]' | $TCLSH`
++  TCL_VERSION_FOUND=`echo 'puts [info tclversion]' | $TCLSH 2>/dev/null | grep -E '^[0-9.]+$'`
+ 
+   # can't assume ksh on all architectures
+   # TCLSH_EXEC_PREFIX=${TCLSH%%/bin/tclsh.*}

diff --git a/config/patches/occt/hdf5.001_threads_threads.patch b/config/patches/occt/hdf5.001_threads_threads.patch
new file mode 100644 (file)
index 0000000..776800f
--- /dev/null
+++ b/config/patches/occt/hdf5.001_threads_threads.patch
@@ -0,0 +1,15 @@
+diff -Naur --exclude=CVS --exclude=.git hdf5-1.10.3_orig/src/CMakeLists.txt hdf5-1.10.3_patched/src/CMakeLists.txt
+--- hdf5-1.10.3_orig/src/CMakeLists.txt        2018-08-10 00:36:31.000000000 +0300
++++ hdf5-1.10.3_patched/src/CMakeLists.txt     2018-10-10 16:25:28.196773245 +0300
+@@ -954,9 +954,10 @@
+           $<$<BOOL:${HDF5_ENABLE_DEBUG_APIS}>:H5Z_DEBUG;H5T_DEBUG;H5ST_DEBUG;H5S_DEBUG;H5O_DEBUG;H5I_DEBUG;H5HL_DEBUG;H5F_DEBUG;H5D_DEBUG;H5B2_DEBUG;H5AC_DEBUG>
+   )
+   TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED)
++  get_property(_threads_libs TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES)
+   target_link_libraries (${HDF5_LIBSH_TARGET}
+       PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>"
+-      PUBLIC $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_DL_LIBS}> $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads>
++      PUBLIC $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_DL_LIBS}> $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:${_threads_libs}>
+   )
+   set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}")
+   H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED "LIB")

diff --git a/config/patches/occt/qt.001_proxy_factory.patch b/config/patches/occt/qt.001_proxy_factory.patch
new file mode 100644 (file)
index 0000000..b39fa98
--- /dev/null
+++ b/config/patches/occt/qt.001_proxy_factory.patch
@@ -0,0 +1,12 @@
+diff -NaurwB /tmp/qt/qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp /tmp/qt/qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp
+--- qt-5.6.1__0/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2016-05-25 18:46:17.000000000 +0300
++++ qt-5.6.1__1/qtbase/src/network/kernel/qnetworkproxy_libproxy.cpp   2017-03-15 17:51:11.051090499 +0300
+@@ -74,7 +74,7 @@
+     QList<QUrl> ret;
+ 
+     if (factory) {
+-        char **proxies = px_proxy_factory_get_proxies(factory, url.toEncoded());
++        char **proxies = px_proxy_factory_get_proxies(factory, url.toEncoded().data());
+         if (proxies) {
+             for (int i = 0; proxies[i]; i++) {
+                 ret.append(QUrl::fromEncoded(proxies[i]));

diff --git a/config/patches/occt/qt.002_disable_qtgamepad.patch b/config/patches/occt/qt.002_disable_qtgamepad.patch
new file mode 100644 (file)
index 0000000..a36711f
--- /dev/null
+++ b/config/patches/occt/qt.002_disable_qtgamepad.patch
@@ -0,0 +1,7 @@
+diff -Naur qt-5.9.1_SRC_orig/qtgamepad/src/plugins/plugins.pro qt-5.9.1_SRC_modif/qtgamepad/src/plugins/plugins.pro
+--- qt-5.9.1_SRC_orig/qtgamepad/src/plugins/plugins.pro        2017-06-23 09:35:28.000000000 +0300
++++ qt-5.9.1_SRC_modif/qtgamepad/src/plugins/plugins.pro       2018-10-31 15:53:41.396430110 +0300
+@@ -1,2 +1,2 @@
+ TEMPLATE = subdirs
+-SUBDIRS += gamepads
++#SUBDIRS += gamepads

diff --git a/config/patches/occt/scotch.001.create_makefile.patch b/config/patches/occt/scotch.001.create_makefile.patch
new file mode 100644 (file)
index 0000000..f9383cc
--- /dev/null
+++ b/config/patches/occt/scotch.001.create_makefile.patch
@@ -0,0 +1,25 @@
+diff -Naur scotch-6.0.4_SRC_orig/src/Makefile.inc scotch-6.0.4_SRC_modif/src/Makefile.inc
+--- scotch-6.0.4_SRC_orig/src/Makefile.inc     1970-01-01 03:00:00.000000000 +0300
++++ scotch-6.0.4_SRC_modif/src/Makefile.inc    2018-10-31 16:29:41.986238044 +0300
+@@ -0,0 +1,21 @@
++EXE           =
++LIB           = .a
++OBJ           = .o
++
++MAKE          = make
++AR            = ar
++ARFLAGS               = -ruv
++CAT           = cat
++CCS           = gcc
++CCP           = mpicc
++CCD           = gcc
++CFLAGS                = -fPIC -pg -O3 -Drestrict=__restrict -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_PTHREAD -DSCOTCH_RENAME
++CLIBFLAGS     =
++LDFLAGS               = -lz -lm -pthread
++CP            = cp
++LEX           = flex -Pscotchyy -olex.yy.c
++LN            = ln
++MKDIR         = mkdir
++MV            = mv
++RANLIB                = ranlib
++YACC          = bison -pscotchyy -y -b y

diff --git a/config/patches/occt/solvespace.001_nogui.patch b/config/patches/occt/solvespace.001_nogui.patch
new file mode 100644 (file)
index 0000000..b273ca6
--- /dev/null
+++ b/config/patches/occt/solvespace.001_nogui.patch
@@ -0,0 +1,50 @@
+diff -Naur '--exclude=CVS' '--exclude=.git' solvespace-2.1.orig/CMakeLists.txt solvespace-2.1.p1/CMakeLists.txt
+--- solvespace-2.1.orig/CMakeLists.txt 2015-09-28 17:55:15.000000000 +0300
++++ solvespace-2.1.p1/CMakeLists.txt   2015-09-28 18:05:50.000000000 +0300
+@@ -28,6 +28,10 @@
+     set(GUI gtk2 CACHE STRING "GUI toolkit to use (one of: gtk2 gtk3)")
+ endif()
+ 
++# options
++
++option(BUILD_GUI "Build only the library part" ON)
++
+ # compiler
+ 
+ if(WIN32)
+@@ -54,6 +58,8 @@
+ 
+ CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
+ 
++if(BUILD_GUI)
++
+ find_package(OpenGL REQUIRED)
+ 
+ find_package(Perl)
+@@ -125,6 +131,8 @@
+     endif()
+ endif()
+ 
++endif(BUILD_GUI)
++
+ # components
+ 
+ if(WIN32)
+diff -Naur '--exclude=CVS' '--exclude=.git' solvespace-2.1.orig/src/CMakeLists.txt solvespace-2.1.p1/src/CMakeLists.txt
+--- solvespace-2.1.orig/src/CMakeLists.txt     2015-09-28 17:55:15.000000000 +0300
++++ solvespace-2.1.p1/src/CMakeLists.txt       2015-09-28 18:07:31.000000000 +0300
+@@ -79,6 +79,8 @@
+ 
+ # generated files
+ 
++if(BUILD_GUI)
++
+ file(GLOB icons "${CMAKE_CURRENT_SOURCE_DIR}/icons/*.png")
+ 
+ if(PERL_FOUND AND PERLMODULES_FOUND)
+@@ -384,3 +386,5 @@
+         --malloc-fill=0xac
+         --free-fill=0xde
+         $<TARGET_FILE:solvespace>)
++
++endif(BUILD_GUI)