Fix master rebase 2 (qt4 compiles)

component/proviewR/buildout.cfg

@@ -384,7 +384,7 @@ make-targets =
 make-options =
   -j1
 environment =
-  PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:files}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
+  PATH=${qt4-qmake:location}/bin:${make-4:location}/bin:${doxygen:location}/bin:${pkgconfig:location}/bin:${java-jdk:location}/bin:${gtk-2:location}/bin:${bison:location}/bin:%(PATH)s
   SHELL=/bin/bash
   PKG_CONFIG_PATH=${qt4-qmake:location}/lib/pkgconfig:${gtk-2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${cairo:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}:${libXext:location}/lib/pkgconfig:${libXext:pkg_config_depends}:${fribidi:location}/lib/pkgconfig:${harfbuzz:location}/lib/pkgconfig:${harfbuzz:pkg_config_depends}:${atk:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${phonon-qt4:location}/lib/pkgconfig:${alsa:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig
   LD_LIBRARY_PATH=${:ld-library-path}

component/qt/buildout.cfg

@@ -16,6 +16,9 @@ shared = true
 location = @@LOCATION@@
 url = http://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtbase-everywhere-src-5.13.1.tar.xz
 md5sum = 0a1761145531b74fff5b4d9a80c7b1c2
+#url = http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.gz
+#md5sum = 7aa5841b50c411e23e31e8a6cc1c6981
+
 configure-command = ./configure
 configure-options =
   --prefix=${:location}
@@ -84,6 +87,7 @@ pre-configure =
   sed 's,/usr/X11R6/lib64,${libX11:location}/lib64 ${xproto:location}/lib64 ${libXext:location}/lib64,g' -i mkspecs/*/*.conf
   sed 's,/usr/X11R6/lib,${libX11:location}/lib ${xproto:location}/lib ${libXext:location}/lib,g' -i mkspecs/*/*.conf
   sed 's,/usr/X11R6/include,${libX11:location}/include ${xproto:location}/include ${libXext:location}/include,g' -i mkspecs/*/*.conf
+  sed '10 a QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -std=gnu++98' -i mkspecs/linux-g++/qmake.conf
 #  sed 's,/usr/local/include,${openssl-1.0:location}/include,g' -i mkspecs/*/*.conf
 #  sed 's,/usr/local/lib,${openssl-1.0:location}/lib,g' -i mkspecs/*/*.conf
 configure-command = ./configure --prefix=${:location} -v -no-separate-debug-info -release -no-fast -confirm-license -opensource -dbus -glib -gtkstyle -no-pch -no-rpath -nomake demos -nomake examples -nomake docs -graphicssystem raster -no-xvideo -no-xinerama -no-xshape -no-xsync  $CPPFLAGS -L${gettext:location}/lib

software/proviewR/instance.cfg

@@ -42,7 +42,7 @@ extra-context =
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw xorg_font_util ${xorg-font-util:location}
   raw xvfb_bin ${xserver:location}/bin/Xvfb
-  raw java_location ${java-jdk:files}
+  raw java_location ${java-jdk:location}
   raw proview_directory ${pwr:location}
   raw proview_compile_dir ${pwr:compile-dir}
   raw ld_library_path ${pwr:ld-library-path}

software/proviewR/software.cfg

@@ -58,7 +58,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
 mode = 0644
-md5sum = 66ce630a6cdb37854a3ef6e0af8a8870
+md5sum = 04aa7533e8468182a1a76086810e1e99
 
 [download-base]
 recipe = hexagonit.recipe.download