[Git][debian-gis-team/zoo-project][master] 3 commits: Update patches from upstream and cleanup
Angelos Tzotsos (@kalxas-guest)
gitlab at salsa.debian.org
Fri Aug 5 13:26:56 BST 2022
Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project
Commits:
54d4ce68 by Angelos Tzotsos at 2022-08-05T15:24:13+03:00
Update patches from upstream and cleanup
- - - - -
33ef6a15 by Angelos Tzotsos at 2022-08-05T15:25:19+03:00
Enable otb support
- - - - -
70aea3b0 by Angelos Tzotsos at 2022-08-05T15:26:38+03:00
Update changelog
- - - - -
11 changed files:
- debian/changelog
- debian/control
- − debian/patches/hardening-buildflags.patch
- − debian/patches/otb-type-fix.patch
- debian/patches/geos-clibs.patch → debian/patches/otb2zcfg_cmake.patch
- − debian/patches/patch_cflags.patch
- + debian/patches/proj-config.patch
- debian/patches/series
- debian/patches/cgal_info.patch → debian/patches/service_internal_python.patch
- − debian/patches/zoo-version.patch
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -15,9 +15,7 @@ zoo-project (1.9.0-1) UNRELEASED; urgency=medium
* Removed mozjs support for Jammy.
* Added uuid dependency.
* Set python version to 3.10
- * Updated cflags patch.
- * Added geos-config patch.
- * Disabled otb services.
+ * Added proj-config patch.
[ Bas Couwenberg ]
* Bump Standards-Version to 4.6.1, no changes.
=====================================
debian/control
=====================================
@@ -21,6 +21,7 @@ Build-Depends: debhelper-compat (= 12),
libxml2-dev,
libxslt1-dev,
uuid-dev,
+ libopengl-dev,
qtbase5-dev,
libqt5opengl5-dev,
lsb-release,
@@ -87,17 +88,17 @@ Description: OGR CGI ZOO services
.
This package contains the OGR CGI ZOO services.
-#Package: zoo-service-otb
-#Architecture: any
-#Depends: ${shlibs:Depends},
-# ${misc:Depends}
-#Description: OTB CGI ZOO services
-# ZOO-Project is a WPS (Web Processing Service) open source project
-# released under a MIT/X-11 style license. It provides an OGC WPS
-# compliant developer-friendly framework to create and chain WPS Web
-# services.
-# .
-# This package contains the OTB CGI ZOO services.
+Package: zoo-service-otb
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Description: OTB CGI ZOO services
+ ZOO-Project is a WPS (Web Processing Service) open source project
+ released under a MIT/X-11 style license. It provides an OGC WPS
+ compliant developer-friendly framework to create and chain WPS Web
+ services.
+ .
+ This package contains the OTB CGI ZOO services.
Package: zoo-service-status
Architecture: any
=====================================
debian/patches/hardening-buildflags.patch deleted
=====================================
@@ -1,112 +0,0 @@
-Description: Use hardening buildflags.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/thirds/cgic206/Makefile
-+++ b/thirds/cgic206/Makefile
-@@ -6,7 +6,7 @@ ifeq ($(OS),Darwin)
- else
- LIBS= -L./ -lcgic /usr/lib/libfcgi.a
- endif
--CFLAGS=-g -Wall ${MACOS_CFLAGS}
-+#CFLAGS+=-g -Wall ${MACOS_CFLAGS}
- CC=gcc
- AR=ar
- RANLIB=ranlib
---- a/zoo-project/zoo-kernel/configure.ac
-+++ b/zoo-project/zoo-kernel/configure.ac
-@@ -925,6 +925,14 @@ AC_SUBST([SAGA_LDFLAGS])
- AC_SUBST([SAGA_FILE])
- AC_SUBST([SAGA_ENABLED])
-
-+HARDENING_CFLAGS=`dpkg-buildflags --get CFLAGS`
-+HARDENING_CPPFLAGS=`dpkg-buildflags --get CPPFLAGS`
-+HARDENING_LDFLAGS=`dpkg-buildflags --get LDFLAGS`
-+
-+AC_SUBST([HARDENING_CFLAGS])
-+AC_SUBST([HARDENING_CPPFLAGS])
-+AC_SUBST([HARDENING_LDFLAGS])
-+
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([ZOOMakefile.opts])
- AC_OUTPUT
---- a/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-+++ b/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-@@ -100,8 +100,12 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
- MONO_ENABLED=@MONO_ENABLED@
- MONO_FILE=@MONO_FILE@
-
--CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
--LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS}
-+HARDENING_CFLAGS=@HARDENING_CFLAGS@
-+HARDENING_CPPFLAGS=@HARDENING_CPPFLAGS@
-+HARDENING_LDFLAGS=@HARDENING_LDFLAGS@
-+
-+CFLAGS=${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-+LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${HARDENING_LDFLAGS}
-
- DATAROOTDIR=@datarootdir@/zoo-project
--SHAREDSTATEDIR=@sharedstatedir@/zoo-project
-\ No newline at end of file
-+SHAREDSTATEDIR=@sharedstatedir@/zoo-project
---- a/zoo-project/zoo-kernel/Makefile.in
-+++ b/zoo-project/zoo-kernel/Makefile.in
-@@ -102,7 +102,7 @@ zoo_service_loader.o: zoo_service_loader
- g++ -g -O2 ${XML2CFLAGS} ${CFLAGS} ${MONO_CFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${SAGA_ENABLED} ${OTB_ENABLED} ${PYTHON_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} ${MONO_ENABLED} -c zoo_service_loader.c -fno-common -DPIC -o zoo_service_loader.o
-
- libzoo_service.${EXT}: version.h service_internal.o service.o sqlapi.o
-- gcc -shared ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS} service_internal.o service.o sqlapi.o ${FCGI_LDFLAGS} ${GDAL_LIBS}
-+ gcc -shared ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS} service_internal.o service.o sqlapi.o ${FCGI_LDFLAGS} ${GDAL_LIBS} ${HARDENING_LDFLAGS}
-
- zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE}
- g++ -g -O2 ${JSCFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${RUBYCFLAGS} ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c -fno-common -DPIC -o zoo_loader.o
---- a/zoo-project/zoo-services/cgal/Makefile
-+++ b/zoo-project/zoo-services/cgal/Makefile
-@@ -1,12 +1,12 @@
- ZRPATH=../..
- include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
--CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG
-+CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC ${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
- CC=gcc
-
- cgi-env/cgal_service.zo: delaunay.c voronoi.c cgal_service.o
- g++ ${CFLAGS} -c ./delaunay.c
- g++ ${CFLAGS} -c ./voronoi.c
-- g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
-+ g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service ${HARDENING_LDFLAGS}
-
- cgal_service.o: cgal_service.c cgal_service.h
- g++ ${CFLAGS} -c ./cgal_service.c
---- a/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
-+++ b/zoo-project/zoo-services/ogr/base-vect-ops/Makefile
-@@ -1,6 +1,6 @@
- ZRPATH=../../..
- include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
--CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${GEOS_CFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
-+CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${GEOS_CFLAGS} ${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
-
- ifneq ($(MS_FILE),)
- MS_FILES=${ZRPATH}/zoo-kernel/${MS_FILE} -lmapserver
-@@ -9,7 +9,7 @@ else
- endif
-
- cgi-env/ogr_service.zo: service.c
-- g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi -lpthread -L${ZRPATH}/zoo-kernel/ -lzoo_service
-+ g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${GEOS_LDFLAGS} -lfcgi -lpthread -L${ZRPATH}/zoo-kernel/ -lzoo_service ${HARDENING_LDFLAGS}
-
- install:
- install -d ${CGI_DIR}/ogr/base-vect-ops
---- a/zoo-project/zoo-services/utils/status/Makefile
-+++ b/zoo-project/zoo-services/utils/status/Makefile
-@@ -1,9 +1,9 @@
- ZRPATH=../../..
- include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
--CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
-+CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${HARDENING_CFLAGS} ${HARDENING_CPPFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
-
- cgi-env/wps_status.zo: service.c
-- g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
-+ g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/ -lzoo_service ${HARDENING_LDFLAGS}
-
- install:
- install -d ${CGI_DIR}
=====================================
debian/patches/otb-type-fix.patch deleted
=====================================
@@ -1,155 +0,0 @@
-Description: Patch to ignore old otb types
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2021-02-01
-
---- zoo-project-1.8.0+ds.orig/thirds/otb2zcfg/otb2zcfg.cxx
-+++ zoo-project-1.8.0+ds/thirds/otb2zcfg/otb2zcfg.cxx
-@@ -221,7 +221,7 @@ int main(int itkNotUsed(argc), char * it
-
- if(type == ParameterType_StringList || type == ParameterType_String || type == ParameterType_Float
- || type == ParameterType_Int || type == ParameterType_Choice || type == ParameterType_ListView
-- || type == ParameterType_RAM || type == ParameterType_Empty || type == ParameterType_Directory){
-+ || type == ParameterType_RAM /*|| type == ParameterType_Empty*/ || type == ParameterType_Directory){
- std::cout << " <LiteralData>" << std::endl;
- std::string lt;
- if(type == ParameterType_Int || type == ParameterType_RAM)
-@@ -232,8 +232,8 @@ int main(int itkNotUsed(argc), char * it
- || type == ParameterType_Choice || type == ParameterType_Directory
- || type == ParameterType_ListView)
- lt="string";
-- if(type == ParameterType_Empty)
-- lt="boolean";
-+ /*if(type == ParameterType_Empty)
-+ lt="boolean";*/
- std::cout << " dataType = " << lt << std::endl;
- if(type == ParameterType_Choice || type == ParameterType_ListView){
- const std::vector<std::string> nList = m_Application->GetChoiceNames(paramKey);
-@@ -280,11 +280,11 @@ int main(int itkNotUsed(argc), char * it
- printOutputImage(m_Application->GetParameterOutputImagePixelType(paramKey));
- }
- else{
-- if(type == ParameterType_ComplexOutputImage){
-+ /*if(type == ParameterType_ComplexOutputImage){
- printOutputComplexImage(m_Application->GetParameterComplexOutputImagePixelType(paramKey));
-- }else{
-+ }else*/{
- std::cout << " <ComplexData>" << std::endl;
-- if(type == ParameterType_InputImage || type == ParameterType_InputImageList || type == ParameterType_ComplexInputImage){
-+ if(type == ParameterType_InputImage || type == ParameterType_InputImageList){
- printImages();
- }
- else
-@@ -337,7 +337,7 @@ int main(int itkNotUsed(argc), char * it
-
- if(paramKey!="inxml" && paramKey!="outxml" &&
- ((type == ParameterType_OutputVectorData || type == ParameterType_OutputImage
-- || type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage
-+ || type == ParameterType_OutputImage //|| type == ParameterType_ComplexOutputImage
- || type == ParameterType_OutputFilename) || role==1) && type != ParameterType_Group){
- hasOutput=1;
- std::vector<std::string> values;
-@@ -355,7 +355,7 @@ int main(int itkNotUsed(argc), char * it
- std::cout << " Abstract = " << paramKey << std::endl;
- }
-
-- if(type == ParameterType_OutputImage || type == ParameterType_ComplexOutputImage){
-+ if(type == ParameterType_OutputImage){// || type == ParameterType_ComplexOutputImage){
- std::cout << " <ComplexData>" << std::endl;
- printImages();
- std::cout << " </ComplexData>" << std::endl;
---- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/configure.ac
-+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/configure.ac
-@@ -414,8 +414,8 @@ PROJ_CPPFLAGS="-I$PROJPATH/include"
- # Check headers file
- CPPFLAGS_SAVE="$CPPFLAGS"
- CPPFLAGS="$PROJ_CPPFLAGS"
--AC_CHECK_HEADERS([proj_api.h],
-- [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
-+#AC_CHECK_HEADERS([proj_api.h],
-+# [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
-
- AC_SUBST([PROJ_CPPFLAGS])
- AC_SUBST([PROJ_LDFLAGS])
-@@ -606,7 +606,8 @@ else
-
- echo $PYTHONCONFIG
- # Extract the linker and include flags
-- PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
-+ PYTHON_LDFLAGS=$($PYTHONCONFIG --ldflags | sed "s:python${PYTHON_VERS}/config-${PYTHON_VERS}-::g")
-+ echo $PYTHON_LDFLAGS
- PYTHON_CPPFLAGS=`$PYTHONCONFIG --includes`
-
- # Check headers file
-@@ -617,10 +618,11 @@ else
-
- # Ensure we can link against libphp
- LIBS_SAVE="$LIBS"
-- LIBS="$PYTHON_LDFLAGS"
-- PY_LIB=`$PYTHONCONFIG --libs | sed \
-- -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
-- AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
-+ LIBS="m $PYTHON_LDFLAGS -lpython${PYTHON_VERS}"
-+ PYTHON_LDFLAGS="-l$LIBS"
-+ PY_LIB=`$PYTHONCONFIG --libs`
-+ LDFLAGS=$PYTHON_LDFLAGS
-+ AC_CHECK_LIB([], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
- LIBS="$LIBS_SAVE"
- fi
-
---- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/service_internal_otb.c
-+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/service_internal_otb.c
-@@ -361,7 +361,7 @@ int zoo_otb_support(maps** main_conf,map
- }
- else
- if(type == ParameterType_InputImage
-- || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
-+ || type == ParameterType_InputVectorData
- || type == ParameterType_InputFilename){
- m_Application->SetParameterString(paramKey, test->value);
- }
---- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/ulinet.h
-+++ zoo-project-1.8.0+ds/zoo-project/zoo-kernel/ulinet.h
-@@ -33,7 +33,7 @@
- #endif
- #include "jsapi.h"
- #endif
--#include "fcgi_stdio.h"
-+//#include "fcgi_stdio.h"
- #include <stdlib.h>
- #include <fcntl.h>
- #include <curl/curl.h>
---- zoo-project-1.8.0+ds.orig/zoo-project/zoo-services/ogr/base-vect-ops/service.c
-+++ zoo-project-1.8.0+ds/zoo-project/zoo-services/ogr/base-vect-ops/service.c
-@@ -37,18 +37,13 @@
- #include "service.h"
- #include "service_internal.h"
-
--extern "C" {
- #include <libxml/tree.h>
- #include <libxml/parser.h>
- #include <libxml/xpath.h>
- #include <libxml/xpathInternals.h>
-
--/*#include <openssl/sha.h>
--#include <openssl/hmac.h>
--#include <openssl/evp.h>
--#include <openssl/bio.h>
--#include <openssl/buffer.h>
--*/
-+extern "C" {
-+
-
- void printExceptionReportResponse(maps*,map*);
- char *base64(const char *input, int length);
=====================================
debian/patches/geos-clibs.patch → debian/patches/otb2zcfg_cmake.patch
=====================================
@@ -1,5 +1,4 @@
-Description: Patch configure.ac to use geos clibs
- .
+Description: Patch otb2zcfg cmake file
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
---
@@ -13,16 +12,36 @@ Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2022-08-02
+Last-Update: 2022-08-05
---- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/configure.ac
-+++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/configure.ac
-@@ -447,7 +447,7 @@ else
- fi
- fi
-
--GEOS_LDFLAGS=`$GEOSCONFIG --libs`
-+GEOS_LDFLAGS=`$GEOSCONFIG --clibs`
- GEOS_CPPFLAGS=`$GEOSCONFIG --cflags`
-
- # Check headers file
+--- zoo-project-1.9.0+ds.orig/thirds/otb2zcfg/CMakeLists.txt
++++ zoo-project-1.9.0+ds/thirds/otb2zcfg/CMakeLists.txt
+@@ -1,14 +1,15 @@
+-PROJECT(otb2zcfg)
+-
+-cmake_minimum_required(VERSION 2.6)
+-
+-FIND_PACKAGE(OTB)
+-IF(OTB_FOUND)
+- INCLUDE(${OTB_USE_FILE})
+-ELSE(OTB_FOUND)
+- MESSAGE(FATAL_ERROR
+- "Cannot build OTB project without OTB. Please set OTB_DIR.")
+-ENDIF(OTB_FOUND)
+-
++PROJECT(otb2zcfg)
++
++cmake_minimum_required(VERSION 3.1.0)
++
++find_package(Boost 1.65.0 COMPONENTS serialization filesystem REQUIRED)
++
++find_package(OTB)
++if(OTB_FOUND)
++ include(${OTB_USE_FILE})
++else(OTB_FOUND)
++ message(FATAL_ERROR "Cannot build OTB project without OTB. Please set OTB_DIR.")
++endif(OTB_FOUND)
++
+ ADD_EXECUTABLE(otb2zcfg otb2zcfg.cxx )
+-TARGET_LINK_LIBRARIES(otb2zcfg OTBCommon OTBApplicationEngine OTBImageIO ${ITK_LIBRARIES})
++TARGET_LINK_LIBRARIES(otb2zcfg ${OTB_LIBRARIES})
=====================================
debian/patches/patch_cflags.patch deleted
=====================================
@@ -1,28 +0,0 @@
-Description: Patch to take into account the proj version
- .
-Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2022-08-02
-
---- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-+++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/ZOOMakefile.opts.in
-@@ -120,7 +120,7 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
- MONO_ENABLED=@MONO_ENABLED@
- MONO_FILE=@MONO_FILE@
-
--CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
-+CFLAGS=-DPROJ_VERSION_MAJOR=$(shell dpkg-query -W -f='$${Version}' libproj-dev | awk -F. '{ print $$1 }') @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
- LDFLAGS=-lzoo_service @SSH2_LDFLAGS@ @PROJ_LDFLAGS@ @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ @UUID_LDFLAGS@ ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${RLDFLAGS} @JSON_LDFLAGS@ @XSLT_LDFLAGS@
-
- DATAROOTDIR=@datarootdir@/zoo-project
=====================================
debian/patches/proj-config.patch
=====================================
@@ -0,0 +1,173 @@
+Description: Patch to configure latest proj
+Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2022-08-05
+
+--- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/ZOOMakefile.opts.in
++++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/ZOOMakefile.opts.in
+@@ -67,6 +67,11 @@ RUBYLDFLAGS=@RUBY_LDFLAGS@
+ RUBY_ENABLED=@RUBY_ENABLED@
+ RUBY_FILE=@RUBY_FILE@
+
++RABBITMQ_LDFLAGS=@RABBITMQ_LDFLAGS@
++RABBITMQ_CPPFLAGS=@RABBITMQ_CPPFLAGS@
++RABBITMQ_FILE=@RABBITMQ_FILE@
++ZOOFPM_FILE=@ZOOFPM_FILE@
++
+ JS_ENABLED=@JS_ENABLED@
+ JSCFLAGS=@JS_CPPFLAGS@
+ JSLDFLAGS=@JS_LDFLAGS@
+@@ -75,12 +80,12 @@ ifeq ($(JS_ENABLED),-DUSE_JS)
+ JS_LDFLAGS=${ZRPATH}/zoo-kernel/ulinet.o ${ZRPATH}/zoo-kernel/service_internal_js.o -lcurl
+ endif
+
+-MS_CFLAGS=@MS_CFLAGS@
++MS_CFLAGS=@MS_CFLAGS@ @PROJ_CPPFLAGS@
+ MS_LDFLAGS=@MS_LIBS@
+ MS_FILE=@MS_FILE@
+
+ ZOO_CFLAGS=-I${ZRPATH}/../thirds/cgic206/ -I${ZRPATH}/zoo-kernel/
+-ZOO_LDFLAGS=@OPENSSL_LDFLAGS@ @UUID_LDFLAGS@
++ZOO_LDFLAGS=@OPENSSL_LDFLAGS@
+
+ JAVACFLAGS=@JAVA_CPPFLAGS@
+ JAVALDFLAGS=@JAVA_LDFLAGS@
+@@ -120,8 +125,11 @@ MONO_LDFLAGS=@MONO_LDFLAGS@
+ MONO_ENABLED=@MONO_ENABLED@
+ MONO_FILE=@MONO_FILE@
+
+-CFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H @CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
+-LDFLAGS=-lzoo_service @SSH2_LDFLAGS@ @PROJ_LDFLAGS@ @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ @UUID_LDFLAGS@ ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${RLDFLAGS} @JSON_LDFLAGS@ @XSLT_LDFLAGS@
++CFLAGS=@CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} ${RABBITMQ_CPPFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
++
++CPPFLAGS=@CALLBACK_USE@ @SSH2_CPPFLAGS@ @PROJ_CPPFLAGS@ @RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ @UUID_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} ${RABBITMQ_CPPFLAGS} ${IRODS_CPPFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
++
++LDFLAGS=@UUID_LDFLAGS@ -lzoo_service @SSH2_LDFLAGS@ @PROJ_LDFLAGS@ @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${RABBITMQ_LDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ @UUID_LDFLAGS@ ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} ${RLDFLAGS} @JSON_LDFLAGS@ @XSLT_LDFLAGS@
+
+ DATAROOTDIR=@datarootdir@/zoo-project
+ SHAREDSTATEDIR=@sharedstatedir@/zoo-project
+--- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/configure.ac
++++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/configure.ac
+@@ -5,9 +5,19 @@ AC_CONFIG_MACRO_DIR([macros])
+ # Checks for programs.
+ AC_PROG_YACC
+ AC_PROG_CC
+-AC_PROG_LEX
+ AC_PROG_CXX
+ AC_PROG_SED
++AC_PROG_AWK
++
++dnl autoconf 2.69 AC_PROG_LEX has no parameters
++dnl autoconf 2.70 AC_PROG_LEX prints a deprecation warning without params
++m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1], [dnl
++ dnl autoconf < 2.70
++ AC_PROG_LEX
++], [
++ dnl autoconf >= 2.70
++ AC_PROG_LEX([noyywrap])
++])
+
+ # Checks for libraries.
+ AC_CHECK_LIB([curl], [curl_easy_init,curl_easy_setopt,curl_easy_cleanup,curl_easy_perform])
+@@ -100,6 +110,33 @@ AC_SUBST([CALLBACK_FILE])
+ AC_SUBST([CALLBACK_USE])
+
+ #============================================================================
++# Detect if rabbitmq is available
++#============================================================================
++
++AC_ARG_WITH([rabbitmq],
++ [AS_HELP_STRING([--with-rabbitmq], [asynchronous requests management with rabbitmq ])],
++ [AMQP="-DUSE_AMQP"], [AMQP=""])
++
++if test -z "$AMQP"
++then
++ RABBITMQ_LDFLAGS=""
++ RABBITMQ_CPPFLAGS=""
++ RABBITMQ_FILE=""
++else
++ AC_CHECK_LIB([rabbitmq], [main])
++ RABBITMQ_LDFLAGS=`pkg-config --libs librabbitmq`
++ RABBITMQ_CPPFLAGS="-DUSE_AMQP" `pkg-config --cflags librabbitmq`
++ RABBITMQ_FILE="service_internal_amqp.o"
++ ZOOFPM_FILE="zoo_loader_fpm"
++ RELY_ON_DB="-DRELY_ON_DB"
++ AC_SUBST([RELY_ON_DB])
++fi
++AC_SUBST([RABBITMQ_LDFLAGS])
++AC_SUBST([RABBITMQ_CPPFLAGS])
++AC_SUBST([RABBITMQ_FILE])
++AC_SUBST([ZOOFPM_FILE])
++
++#============================================================================
+ # Detect if openssl is available
+ #============================================================================
+
+@@ -405,11 +442,19 @@ AC_SUBST([GDAL_LIBS])
+
+ AC_ARG_WITH([proj],
+ [AS_HELP_STRING([--with-proj=PATH], [Specifies an alternative location for PROJ4 setup])],
+- [PROJPATH="$withval"], [PROJPATH=""])
++ [PROJPATH="$withval"], [PROJPATH="/usr"])
+
+ # Extract the linker and include flags
++if test -f $PROJPATH/include/proj_api.h ; then
++ PJ_FULL_VERSION="$(grep 'define PJ_VERSION' /usr/include/proj_api.h | awk {'print $3'})"
++ PROJ_MAJOR_VERSION="$(echo ${PJ_FULL_VERSION:0:1})"
++ PROJ_VERSION="-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H -DPROJ_VERSION_MAJOR=${PROJ_MAJOR_VERSION}"
++else
++ PROJ_MAJOR_VERSION="$(grep "define PROJ_VERSION_MAJOR" -rni $PROJPATH/include/proj.h | awk {'print $3'})"
++ PROJ_VERSION="-DPROJ_VERSION_MAJOR=${PROJ_MAJOR_VERSION}"
++fi
++PROJ_CPPFLAGS="-I$PROJPATH/include ${PROJ_VERSION}"
+ PROJ_LDFLAGS="-L$PROJPATH/lib"
+-PROJ_CPPFLAGS="-I$PROJPATH/include"
+
+ # Check headers file
+ CPPFLAGS_SAVE="$CPPFLAGS"
+@@ -447,7 +492,7 @@ else
+ fi
+ fi
+
+-GEOS_LDFLAGS=`$GEOSCONFIG --libs`
++GEOS_LDFLAGS=`$GEOSCONFIG --clibs`
+ GEOS_CPPFLAGS=`$GEOSCONFIG --cflags`
+
+ # Check headers file
+@@ -1008,13 +1053,12 @@ else
+ else
+ ITK_LDFLAGS="-lITKBiasCorrection-$ITKVERS -lITKCommon-$ITKVERS -lITKIOImageBase-$ITKVERS -lITKKLMRegionGrowing-$ITKVERS -lITKLabelMap-$ITKVERS -lITKMesh-$ITKVERS -lITKMetaIO-$ITKVERS -lITKOptimizers-$ITKVERS -lITKPath-$ITKVERS -lITKPolynomials-$ITKVERS -lITKQuadEdgeMesh-$ITKVERS -lITKSpatialObjects-$ITKVERS -lITKStatistics-$ITKVERS -lITKVNLInstantiation-$ITKVERS -lITKWatersheds-$ITKVERS -litkNetlibSlatec-$ITKVERS -litksys-$ITKVERS -litkv3p_netlib-$ITKVERS -litkvcl-$ITKVERS -litkvnl-$ITKVERS -litkvnl_algo-$ITKVERS"
+ fi
+-
+- if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then
+- OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
++ if test -a "${OTBPATH}/include/OTB-${OTBVERS}" ; then
++ OTB_RPATH="$OTBPATH/include/OTB-${OTBVERS}/"
+ OTB_CPPFLAGS="-I${OTB_RPATH} -I${OTB_RPATH}ApplicationEngine -I$OTB_RPATH/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTB_RPATH/Utilities/ITK -I$OTB_RPATH/ -I$OTB_RPATH/IO -I$OTB_RPATH/UtilitiesAdapters/OssimAdapters -I$OTB_RPATH/UtilitiesAdapters/CurlAdapters -I$OTB_RPATH/Utilities/BGL -I$OTB_RPATH/UtilitiesAdapters/ITKPendingPatches -I$OTB_RPATH/Utilities/otbconfigfile $GDAL_CFLAGS"
+ OTB_LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -lOTBImageIO-$OTBVERS -lOTBCommon-$OTBVERS -lOTBApplicationEngine-$OTBVERS -L$ITKPATH/lib $ITK_LDFLAGS"
+ else
+- OTB_CPPFLAGS="-I${OTB_RPATH} -I$OTBPATH/include/otb/ApplicationEngine -I$OTBPATH/include/otb/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTBPATH/include/otb/Utilities/ITK -I$OTBPATH/include/otb/ -I$OTBPATH/include/otb/IO -I$OTBPATH/include/otb/UtilitiesAdapters/OssimAdapters -I$OTBPATH/include/otb/UtilitiesAdapters/CurlAdapters -I$OTBPATH/include/otb/Utilities/BGL -I$OTBPATH/include/otb/UtilitiesAdapters/ITKPendingPatches -I$OTBPATH/include/otb/Utilities/otbconfigfile $GDAL_CFLAGS"
++ OTB_CPPFLAGS="-I$OTBPATH/include/otb/ApplicationEngine -I$OTBPATH/include/otb/Common -I$ITKPATH/include/ITK-$ITKVERS -I$OTBPATH/include/otb/Utilities/ITK -I$OTBPATH/include/otb/ -I$OTBPATH/include/otb/IO -I$OTBPATH/include/otb/UtilitiesAdapters/OssimAdapters -I$OTBPATH/include/otb/UtilitiesAdapters/CurlAdapters -I$OTBPATH/include/otb/Utilities/BGL -I$OTBPATH/include/otb/UtilitiesAdapters/ITKPendingPatches -I$OTBPATH/include/otb/Utilities/otbconfigfile $GDAL_CFLAGS"
+ OTB_LDFLAGS="-L$OTBPATH/lib/otb -lOTBIO -lOTBCommon -lOTBApplicationEngine -L$ITKPATH/lib $ITK_LDFLAGS"
+
+ fi
+@@ -1035,7 +1079,7 @@ else
+ #UVERS="$(echo -e '5.8\n$OTBVERS' | sort -r | head -n1)"
+ #if test "$OTBVERS" == "$UVERS" ; then
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplicationRegistry.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplications();]])],
+- [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_ERROR([checking for GetAvailableApplications... failed])])
++ [AC_MSG_RESULT([checking for GetAvailableApplications... yes])],[AC_MSG_WARN([checking for GetAvailableApplications... failed])])
+ #else
+ # AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include "otbWrapperApplication.h"]],[[std::vector<std::string> list = otb::Wrapper::ApplicationRegistry::GetAvailableApplication();]])],
+ # [AC_MSG_RESULT([checking for GetAvailableApplication... yes])],[AC_MSG_ERROR([checking for GetAvailableApplication... failed])])
=====================================
debian/patches/series
=====================================
@@ -1,11 +1,7 @@
-#hardening-buildflags.patch
-#zoo-version.patch
cachedir.patch
servicepath.patch
libpath.patch
cgic-multiarch.patch
-#cgal_info.patch
-#proj_api.patch
-#otb-type-fix.patch
-patch_cflags.patch
-geos-clibs.patch
+otb2zcfg_cmake.patch
+proj-config.patch
+service_internal_python.patch
=====================================
debian/patches/cgal_info.patch → debian/patches/service_internal_python.patch
=====================================
@@ -5,13 +5,9 @@ Description: <short summary of the patch>
information below has been extracted from the changelog. Adjust it or drop
it.
.
- zoo-project (1.7.0+ds-1~bionic4) bionic; urgency=medium
+ zoo-project (1.9.0+ds-1~jammy1) jammy; urgency=medium
.
- * New upstream version.
- * Enable PIE for Bionic.
- * Add otb-qgis,qtbase5-dev,libqt5opengl5-dev,libfcgi-dev to dependencies.
- * Add patch for cgic makefile
- * Add patch for CGAL demo
+ * Patch otb2zcfg CMake.
Author: Angelos Tzotsos <gcpp.kalxas at gmail.com>
---
@@ -25,16 +21,38 @@ Bug-Debian: https://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2019-07-23
+Last-Update: 2022-08-05
---- zoo-project-1.7.0+ds.orig/zoo-project/zoo-services/cgal/voronoi.c
-+++ zoo-project-1.7.0+ds/zoo-project/zoo-services/cgal/voronoi.c
-@@ -200,7 +200,7 @@ extern "C" {
- Face_iterator fit =T.faces_begin();
- FILE* f=fopen("/tmp/toto.log","w+");
- for ( ; fit !=T.faces_end(); ++fit) {
-- fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
-+ // fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
- fflush(stderr);
-
- nf++;
+--- zoo-project-1.9.0+ds.orig/zoo-project/zoo-kernel/service_internal_python.c
++++ zoo-project-1.9.0+ds/zoo-project/zoo-kernel/service_internal_python.c
+@@ -250,12 +250,20 @@ int zoo_python_support(maps** main_conf,
+ Py_Initialize();
+ #if PY_MAJOR_VERSION >= 3
+ PyEval_InitThreads();
+- PyImport_ImportModule("zoo");
++ PyImport_ImportModule("zoo");
+ #else
+ init_zoo();
+-#endif
++#endif
++#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION < 10
+ mainstate = PyThreadState_Swap(NULL);
+ PyEval_ReleaseLock();
++#else
++#if PY_MAJOR_VERSION >= 3 && PY_MINOR_VERSION >= 10
++ mainstate = PyEval_SaveThread();
++#else
++ mainstate = PyThreadState_Swap(NULL);
++#endif
++#endif
+ PyGILState_STATE gstate;
+ gstate = PyGILState_Ensure();
+ PyObject *pName, *pModule, *pFunc;
+@@ -287,6 +295,7 @@ int zoo_python_support(maps** main_conf,
+ }
+
+ pModule = PyImport_Import(pName);
++ Py_DECREF(pName);
+ int res=SERVICE_FAILED;
+ if (pModule != NULL) {
+ pFunc=PyObject_GetAttrString(pModule,s->name);
=====================================
debian/patches/zoo-version.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Extract SVN revision from changelog version.
- Package is not built from SVN, svnversion is not available.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/zoo-project/zoo-kernel/Makefile.in
-+++ b/zoo-project/zoo-kernel/Makefile.in
-@@ -3,7 +3,7 @@ include ZOOMakefile.opts
- all: version.h zoo_loader.cgi ${YAML_FILE1}
-
- version.h: Makefile
-- echo "#define ZOO_VERSION \"1.6.0 `svnversion`\"" > version.h
-+ echo "#define ZOO_VERSION \"`dpkg-parsechangelog -l ../../debian/changelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/.*+svn//; s/+ds[0-9]*//; s/^[0-9]://'`\"" > version.h
- echo "@ETC_DEF@" >> version.h
- echo "#define LOCALEDIR \"@localedir@\"" >> version.h
-
=====================================
debian/rules
=====================================
@@ -47,8 +47,8 @@ override_dh_auto_clean:
(cd zoo-project/zoo-services/utils/status && make clean); \
fi
- #dh_auto_clean --sourcedirectory=thirds/otb2zcfg \
- # --builddirectory=thirds/otb2zcfg/build
+ dh_auto_clean --sourcedirectory=thirds/otb2zcfg \
+ --builddirectory=thirds/otb2zcfg/build
override_dh_auto_configure:
dh_auto_configure --sourcedirectory=zoo-project/zoo-kernel \
@@ -66,8 +66,8 @@ override_dh_auto_configure:
--with-otb=/usr \
--with-otb-version=$(OTB_VERSION)
- #dh_auto_configure --sourcedirectory=thirds/otb2zcfg \
- # --builddirectory=thirds/otb2zcfg/build
+ dh_auto_configure --sourcedirectory=thirds/otb2zcfg \
+ --builddirectory=thirds/otb2zcfg/build
override_dh_auto_build:
dh_auto_build --sourcedirectory=thirds/cgic206 \
@@ -80,20 +80,20 @@ override_dh_auto_build:
(cd zoo-project/zoo-services/ogr/base-vect-ops && make)
(cd zoo-project/zoo-services/utils/status && make)
- #dh_auto_build --sourcedirectory=thirds/otb2zcfg \
- # --builddirectory=thirds/otb2zcfg/build
-
- #( \
- # mkdir thirds/otb2zcfg/build/zcfgs; \
- # cd thirds/otb2zcfg/build/zcfgs; \
- # ITK_AUTOLOAD_PATH=/usr/lib/${DEB_HOST_MULTIARCH}/otb/applications/ ../otb2zcfg || echo "Ignoring otb2zcfg failure"; \
- # for i in BandMath Despeckle; do \
- # sed -i "s:mimeType = image/png:mimeType = image/png\nuseMapserver = true\nmsClassify = true:g" $$i.zcfg; \
- # done; \
- # for i in Smoothing; do \
- # sed -i "s:mimeType = image/png:mimeType = image/png\nuseMapserver = true:" $$i.zcfg; \
- # done \
- #)
+ dh_auto_build --sourcedirectory=thirds/otb2zcfg \
+ --builddirectory=thirds/otb2zcfg/build
+
+ ( \
+ mkdir thirds/otb2zcfg/build/zcfgs; \
+ cd thirds/otb2zcfg/build/zcfgs; \
+ ITK_AUTOLOAD_PATH=/usr/lib/${DEB_HOST_MULTIARCH}/otb/applications/ ../otb2zcfg || echo "Ignoring otb2zcfg failure"; \
+ for i in BandMath Despeckle; do \
+ sed -i "s:mimeType = image/png:mimeType = image/png\nuseMapserver = true\nmsClassify = true:g" $$i.zcfg; \
+ done; \
+ for i in Smoothing; do \
+ sed -i "s:mimeType = image/png:mimeType = image/png\nuseMapserver = true:" $$i.zcfg; \
+ done \
+ )
override_dh_auto_install:
dh_auto_install --sourcedirectory=zoo-project/zoo-kernel \
@@ -139,9 +139,9 @@ override_dh_auto_install:
install -m644 $(CURDIR)/zoo-project/zoo-services/utils/open-api/templates/* $(CURDIR)/debian/zoo-service-openapi/usr/share/zoo-project/openapi/templates/
# OTB
- #install -d $(CURDIR)/debian/zoo-service-otb/etc/zoo-project
+ install -d $(CURDIR)/debian/zoo-service-otb/etc/zoo-project
- #install -m644 $(CURDIR)/thirds/otb2zcfg/build/zcfgs/*.zcfg $(CURDIR)/debian/zoo-service-otb/etc/zoo-project/
+ install -m644 $(CURDIR)/thirds/otb2zcfg/build/zcfgs/*.zcfg $(CURDIR)/debian/zoo-service-otb/etc/zoo-project/
override_dh_installchangelogs:
dh_installchangelogs -k zoo-project/HISTORY.txt
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/compare/c87732d66a47e591c5281dc0c3545b68e34af285...70aea3b0feaf1a27d691c2981bde91230c3fed05
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/compare/c87732d66a47e591c5281dc0c3545b68e34af285...70aea3b0feaf1a27d691c2981bde91230c3fed05
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220805/110158be/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list