[Git][debian-gis-team/zoo-project][master] 2 commits: Fixed build for Ubuntu Focal, droped CGAL support, updated patches
Angelos Tzotsos
gitlab at salsa.debian.org
Mon Feb 1 13:21:56 GMT 2021
Angelos Tzotsos pushed to branch master at Debian GIS Project / zoo-project
Commits:
7c9df0ee by Angelos Tzotsos at 2021-02-01T15:21:00+02:00
Fixed build for Ubuntu Focal, droped CGAL support, updated patches
- - - - -
bd0e0fd3 by Angelos Tzotsos at 2021-02-01T15:21:30+02:00
Merge branch 'master' of salsa.debian.org:debian-gis-team/zoo-project
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/otb-type-fix.patch
- + debian/patches/patch_cflags.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+zoo-project (1.8.0+ds-1) UNRELEASED; urgency=medium
+
+ * Added patch to deactivate check for proj api.
+ * Added patch to fix non supported otb type and OGR demo.
+ * Removed CGAL demo.
+
+ -- Angelos Tzotsos <gcpp.kalxas at gmail.com> Fri, 29 Jan 2021 14:00:00 +0200
+
zoo-project (1.8.0+ds) UNRELEASED; urgency=medium
[ Angelos Tzotsos ]
=====================================
debian/control
=====================================
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 10~),
libcurl4-gnutls-dev | libcurl-ssl-dev,
libfcgi-dev,
libfftw3-dev,
- libcgal-dev,
libgdal-dev,
libmapserver-dev,
libmozjs185-dev,
@@ -62,8 +61,7 @@ Description: Javascript API for creating and chaining WPS services
Package: zoo-services
Architecture: any
-Depends: zoo-service-cgal (= ${binary:Version}),
- zoo-service-ogr (= ${binary:Version}),
+Depends: zoo-service-ogr (= ${binary:Version}),
zoo-service-otb (= ${binary:Version}),
zoo-service-status (= ${binary:Version}),
${misc:Depends}
@@ -75,18 +73,6 @@ Description: CGI ZOO services
.
This metapackage depends on the individual ZOO service packages.
-Package: zoo-service-cgal
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: CGAL 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 CGAL CGI ZOO services.
-
Package: zoo-service-ogr
Architecture: any
Depends: python,
=====================================
debian/patches/otb-type-fix.patch
=====================================
@@ -0,0 +1,266 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ zoo-project (1.8.0+ds-1~focal8) focal; urgency=medium
+ .
+ * Removing CGAL demo.
+ * OGR demo patch.
+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;
+--- /dev/null
++++ zoo-project-1.8.0+ds/zoo-patch-test2.patch
+@@ -0,0 +1,124 @@
++Index: thirds/otb2zcfg/otb2zcfg.cxx
++===================================================================
++--- thirds/otb2zcfg/otb2zcfg.cxx (révision 981)
+++++ thirds/otb2zcfg/otb2zcfg.cxx (copie de travail)
++@@ -221,7 +221,7 @@
++
++ 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 @@
++ || 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 @@
++ 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 @@
++
++ 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 @@
++ 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;
++Index: zoo-project/zoo-kernel/configure.ac
++===================================================================
++--- zoo-project/zoo-kernel/configure.ac (révision 981)
+++++ zoo-project/zoo-kernel/configure.ac (copie de travail)
++@@ -414,8 +414,8 @@
++ # 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])
++Index: zoo-project/zoo-kernel/service_internal_otb.c
++===================================================================
++--- zoo-project/zoo-kernel/service_internal_otb.c (révision 981)
+++++ zoo-project/zoo-kernel/service_internal_otb.c (copie de travail)
++@@ -361,7 +361,7 @@
++ }
++ else
++ if(type == ParameterType_InputImage
++- || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
+++ || type == ParameterType_InputVectorData
++ || type == ParameterType_InputFilename){
++ m_Application->SetParameterString(paramKey, test->value);
++ }
++Index: zoo-project/zoo-kernel/ulinet.h
++===================================================================
++--- zoo-project/zoo-kernel/ulinet.h (révision 981)
+++++ zoo-project/zoo-kernel/ulinet.h (copie de travail)
++@@ -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>
++Index: zoo-project/zoo-services/ogr/base-vect-ops/service.c
++===================================================================
++--- zoo-project/zoo-services/ogr/base-vect-ops/service.c (révision 981)
+++++ zoo-project/zoo-services/ogr/base-vect-ops/service.c (copie de travail)
++@@ -37,19 +37,14 @@
++ #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);
++
+--- 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])
+--- 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/patch_cflags.patch
=====================================
@@ -0,0 +1,37 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ zoo-project (1.8.0+ds-1~focal3) focal; urgency=medium
+ .
+ * Added patch to deactivate check for proj api.
+ * Added workaround for proj_api.h deprecation.
+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-01-29
+
+--- zoo-project-1.8.0+ds.orig/zoo-project/zoo-kernel/ZOOMakefile.opts.in
++++ zoo-project-1.8.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=@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=@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 -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H #-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/series
=====================================
@@ -4,4 +4,5 @@ cachedir.patch
servicepath.patch
libpath.patch
cgic-multiarch.patch
-cgal_info.patch
+patch_cflags.patch
+otb-type-fix.patch
=====================================
debian/rules
=====================================
@@ -3,6 +3,8 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_CFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+export DEB_CXXFLAGS_MAINT_APPEND=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
# Disable PIE on Ubuntu where it's still problematic
VENDOR_DERIVES_FROM_UBUNTU ?= $(shell dpkg-vendor --derives-from Ubuntu && echo yes)
@@ -59,7 +61,6 @@ override_dh_auto_configure:
--with-js \
--with-java=/usr/lib/jvm/default-java \
--with-java-rpath=yes \
- --with-cgal=/usr \
--with-mapserver=/usr \
--with-ms-version=$(MAPSERVER_VERSION) \
--with-itk=/usr \
@@ -78,7 +79,6 @@ override_dh_auto_build:
--builddirectory=zoo-project/zoo-kernel \
--max-parallel=1
- (cd zoo-project/zoo-services/cgal && make)
(cd zoo-project/zoo-services/ogr/base-vect-ops && make)
(cd zoo-project/zoo-services/utils/status && make)
@@ -89,7 +89,7 @@ override_dh_auto_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 KMeansClassification; do \
+ 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 \
@@ -127,13 +127,6 @@ override_dh_auto_install:
install -m644 $(CURDIR)/zoo-project/zoo-services/utils/status/cgi-env/updateStatus.xsl $(CURDIR)/debian/zoo-service-status/var/lib/zoo-project/
- # CGAL
- install -d $(CURDIR)/debian/zoo-service-cgal/etc/zoo-project
- install -d $(CURDIR)/debian/zoo-service-cgal/usr/lib/zoo-project
-
- install -m755 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zo $(CURDIR)/debian/zoo-service-cgal/usr/lib/zoo-project/
- install -m644 $(CURDIR)/zoo-project/zoo-services/cgal/cgi-env/*.zcfg $(CURDIR)/debian/zoo-service-cgal/etc/zoo-project/
-
# OTB
install -d $(CURDIR)/debian/zoo-service-otb/etc/zoo-project
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/compare/f0ae685fe762072f8d874daf7d17fa82f61c8915...bd0e0fd35e3e22ce43a7187378cab76b8990173c
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/zoo-project/-/compare/f0ae685fe762072f8d874daf7d17fa82f61c8915...bd0e0fd35e3e22ce43a7187378cab76b8990173c
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/20210201/97fe4856/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list