Merge remote-tracking branch 'upstream/master' into zope4py3

component/ghostscript/buildout.cfg

@@ -6,7 +6,6 @@ extends =
   ../libjpeg/buildout.cfg
   ../libtiff/buildout.cfg
   ../libxml2/buildout.cfg
-  ../patch/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../tesseract/buildout.cfg
   ../xz-utils/buildout.cfg
@@ -16,8 +15,8 @@ parts = ghostscript
 [ghostscript]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10021/ghostscript-10.02.1.tar.xz
-md5sum = 26c0cbfa2e09da97f1fc78728048ada8
+url = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10031/ghostscript-10.03.1.tar.gz
+md5sum = 01c515f190de2d8dcce4767407720855
 pkg_config_depends = ${libidn:location}/lib/pkgconfig:${libtiff:location}/lib/pkgconfig:${libjpeg:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${fontconfig:pkg_config_depends}
 # XXX --with-tessdata work arounds a slaprunner bug of having softwares installed in a path containing //
 configure-options =
@@ -28,14 +27,11 @@ configure-options =
   --with-drivers=FILES
   --with-tessdata=$(${buildout:executable} -c 'print("""${:tessdata-location}""".replace("//", "/"))')
 environment =
-  PATH=${patch:location}/bin:${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${:pkg_config_depends}
   CFLAGS=-I${libjpeg:location}/include
   LDFLAGS=-Wl,-rpath=${libidn:location}/lib -Wl,-rpath=${fontconfig:location}/lib -Wl,-rpath=${freetype:location}/lib -Wl,-rpath=${libtiff:location}/lib -L${libjpeg:location}/lib -Wl,-rpath=${libjpeg:location}/lib
   LD_LIBRARY_PATH=${libidn:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libtiff:location}/lib:${libxml2:location}/lib
-patches =
-  https://github.com/ArtifexSoftware/ghostpdl/commit/f8a4030a319705b9402b386a0ada8dd00b8181d3.patch#7b6dcda1cf19e639994921713fb41277
-patch-options = -p1
 # configure gives priority to local jpeg library and refuse mixing local libjpeg with "system" libtiff.
 # We remove this local jpeg library source folder so that configure picks up the slapos versions of these libraries.
 pre-configure = rm -r jpeg

software/ors-amarisoft/buildout.hash.cfg

@@ -44,7 +44,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = d1a724be968a2d5ea1432c0f4a34f199
+md5sum = caa51d27f5a5cd5b23e4c088b3e3bb02
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -56,16 +56,6 @@ config-command = [ -f ${ {{-B('%s-software-template' % ru_ref)}}:is_firmware_upd
 {%- endif %}
 
 
-{#-  push config to RU #}
-
-{%   if ru.get("cu_config_link", None) %}
-[{{ B('%s-cu-config-dl' % ru_ref) }}]
-recipe = slapos.recipe.build:download
-url = {{ ru.cu_config_link }}
-version = {{ ru.get("cu_config_version") }}
-offline = false
-{%   endif %}
-
 [{{ B('%s-cu-config' % ru_ref) }}]
 <= config-base
 url = {{ ru_lopcomm_cu_config_template }}