From eaf2114b220315b1f5ec463a6d6a901931352eff Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mar 08 2021 11:25:48 +0000 Subject: Add mapserver_proj8.patch --- diff --git a/mapserver.spec b/mapserver.spec index eb56bf8..ae8879b 100644 --- a/mapserver.spec +++ b/mapserver.spec @@ -21,6 +21,8 @@ URL: http://www.mapserver.org Source0: https://github.com/%{project_owner}/%{project_name}/archive/rel-%{dashver}/%{project_name}-%{version}.tar.gz # PHP8 compatibility Patch0: mapserver_php8.patch +# Fix proj8 detection +Patch1: mapserver_proj8.patch Requires: httpd Requires: dejavu-sans-fonts diff --git a/mapserver_php8.patch b/mapserver_php8.patch index 5842560..60a8a4b 100644 --- a/mapserver_php8.patch +++ b/mapserver_php8.patch @@ -1,6 +1,6 @@ -diff -rupN MapServer-rel-7-6-2/mapscript/php/class.c MapServer-rel-7-6-2-new/mapscript/php/class.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/class.c MapServer-rel-7-6-2-new/mapscript/php/class.c --- MapServer-rel-7-6-2/mapscript/php/class.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/class.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/class.c 2021-03-08 12:17:14.382289040 +0100 @@ -135,7 +135,7 @@ PHP_METHOD(classObj, __construct) parent_object parent; @@ -440,9 +440,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/class.c MapServer-rel-7-6-2-new/map php_class_new->class = classObj_clone(php_class_old->class, php_layer->layer); -diff -rupN MapServer-rel-7-6-2/mapscript/php/cluster.c MapServer-rel-7-6-2-new/mapscript/php/cluster.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/cluster.c MapServer-rel-7-6-2-new/mapscript/php/cluster.c --- MapServer-rel-7-6-2/mapscript/php/cluster.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/cluster.c 2021-03-05 22:37:39.176990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/cluster.c 2021-03-08 12:17:14.382289040 +0100 @@ -62,7 +62,7 @@ ZEND_END_ARG_INFO() clusterObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(clusterObj, __construct) @@ -603,9 +603,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/cluster.c MapServer-rel-7-6-2-new/m php_cluster->is_ref = 0; MAPSCRIPT_INIT_PARENT(php_cluster->parent) -diff -rupN MapServer-rel-7-6-2/mapscript/php/color.c MapServer-rel-7-6-2-new/mapscript/php/color.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/color.c MapServer-rel-7-6-2-new/mapscript/php/color.c --- MapServer-rel-7-6-2/mapscript/php/color.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/color.c 2021-03-05 22:37:39.182990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/color.c 2021-03-08 12:17:14.382289040 +0100 @@ -63,7 +63,7 @@ ZEND_END_ARG_INFO() colorObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(colorObj, __construct) @@ -766,9 +766,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/color.c MapServer-rel-7-6-2-new/map MAPSCRIPT_INIT_PARENT(php_color->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/error.c MapServer-rel-7-6-2-new/mapscript/php/error.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/error.c MapServer-rel-7-6-2-new/mapscript/php/error.c --- MapServer-rel-7-6-2/mapscript/php/error.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/error.c 2021-03-05 22:37:39.175990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/error.c 2021-03-08 12:17:14.383289040 +0100 @@ -60,7 +60,7 @@ ZEND_END_ARG_INFO() errorObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(errorObj, __construct) @@ -887,9 +887,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/error.c MapServer-rel-7-6-2-new/map return retval; } -diff -rupN MapServer-rel-7-6-2/mapscript/php/grid.c MapServer-rel-7-6-2-new/mapscript/php/grid.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/grid.c MapServer-rel-7-6-2-new/mapscript/php/grid.c --- MapServer-rel-7-6-2/mapscript/php/grid.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/grid.c 2021-03-05 22:37:39.178990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/grid.c 2021-03-08 12:17:14.383289040 +0100 @@ -59,7 +59,7 @@ PHP_METHOD(gridObj, __construct) parent_object parent; @@ -1018,9 +1018,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/grid.c MapServer-rel-7-6-2-new/maps MAPSCRIPT_INIT_PARENT(php_grid->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/hashtable.c MapServer-rel-7-6-2-new/mapscript/php/hashtable.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/hashtable.c MapServer-rel-7-6-2-new/mapscript/php/hashtable.c --- MapServer-rel-7-6-2/mapscript/php/hashtable.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/hashtable.c 2021-03-05 22:37:39.175990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/hashtable.c 2021-03-08 12:17:14.383289040 +0100 @@ -66,7 +66,7 @@ ZEND_END_ARG_INFO() Create a new hashtableObj instance. */ PHP_METHOD(hashtableObj, __construct) @@ -1184,9 +1184,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/hashtable.c MapServer-rel-7-6-2-new MAPSCRIPT_INIT_PARENT(php_hashtable->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/image.c MapServer-rel-7-6-2-new/mapscript/php/image.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/image.c MapServer-rel-7-6-2-new/mapscript/php/image.c --- MapServer-rel-7-6-2/mapscript/php/image.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/image.c 2021-03-05 22:37:39.177990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/image.c 2021-03-08 12:17:14.384289040 +0100 @@ -65,7 +65,7 @@ ZEND_END_ARG_INFO() imageObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(imageObj, __construct) @@ -1391,9 +1391,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/image.c MapServer-rel-7-6-2-new/map return retval; } -diff -rupN MapServer-rel-7-6-2/mapscript/php/label.c MapServer-rel-7-6-2-new/mapscript/php/label.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/label.c MapServer-rel-7-6-2-new/mapscript/php/label.c --- MapServer-rel-7-6-2/mapscript/php/label.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/label.c 2021-03-05 22:37:39.179990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/label.c 2021-03-08 12:17:14.384289040 +0100 @@ -109,7 +109,7 @@ PHP_METHOD(labelObj, __construct) php_label = MAPSCRIPT_OBJ_P(php_label_object, getThis()); @@ -1726,9 +1726,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/label.c MapServer-rel-7-6-2-new/map php_label_new->label = labelObj_clone(php_label_old->label); -diff -rupN MapServer-rel-7-6-2/mapscript/php/labelcache.c MapServer-rel-7-6-2-new/mapscript/php/labelcache.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/labelcache.c MapServer-rel-7-6-2-new/mapscript/php/labelcache.c --- MapServer-rel-7-6-2/mapscript/php/labelcache.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/labelcache.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/labelcache.c 2021-03-08 12:17:14.384289040 +0100 @@ -49,18 +49,18 @@ ZEND_END_ARG_INFO() labelCacheObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(labelCacheObj, __construct) @@ -1812,9 +1812,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/labelcache.c MapServer-rel-7-6-2-ne MAPSCRIPT_INIT_PARENT(php_labelcache->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/labelcachemember.c MapServer-rel-7-6-2-new/mapscript/php/labelcachemember.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/labelcachemember.c MapServer-rel-7-6-2-new/mapscript/php/labelcachemember.c --- MapServer-rel-7-6-2/mapscript/php/labelcachemember.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/labelcachemember.c 2021-03-05 22:37:39.176990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/labelcachemember.c 2021-03-08 12:17:14.384289040 +0100 @@ -49,7 +49,7 @@ ZEND_END_ARG_INFO() labelCacheMemberObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(labelCacheMemberObj, __construct) @@ -1924,9 +1924,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/labelcachemember.c MapServer-rel-7- MAPSCRIPT_INIT_PARENT(php_labelcachemember->parent); php_labelcachemember->point = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/labelleader.c MapServer-rel-7-6-2-new/mapscript/php/labelleader.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/labelleader.c MapServer-rel-7-6-2-new/mapscript/php/labelleader.c --- MapServer-rel-7-6-2/mapscript/php/labelleader.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/labelleader.c 2021-03-05 22:37:39.178990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/labelleader.c 2021-03-08 12:17:14.385289040 +0100 @@ -47,7 +47,7 @@ ZEND_END_ARG_INFO() labelLeaderObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(labelLeaderObj, __construct) @@ -2036,9 +2036,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/labelleader.c MapServer-rel-7-6-2-n MAPSCRIPT_INIT_PARENT(php_labelleader->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/layer.c MapServer-rel-7-6-2-new/mapscript/php/layer.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/layer.c MapServer-rel-7-6-2-new/mapscript/php/layer.c --- MapServer-rel-7-6-2/mapscript/php/layer.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/layer.c 2021-03-05 22:48:40.147940369 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/layer.c 2021-03-08 12:17:14.385289040 +0100 @@ -212,7 +212,7 @@ PHP_METHOD(layerObj, __construct) parent_object parent; @@ -2912,9 +2912,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/layer.c MapServer-rel-7-6-2-new/map php_layer_new->layer = layerObj_clone(php_layer_old->layer); -diff -rupN MapServer-rel-7-6-2/mapscript/php/legend.c MapServer-rel-7-6-2-new/mapscript/php/legend.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/legend.c MapServer-rel-7-6-2-new/mapscript/php/legend.c --- MapServer-rel-7-6-2/mapscript/php/legend.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/legend.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/legend.c 2021-03-08 12:17:14.385289040 +0100 @@ -53,7 +53,7 @@ ZEND_END_ARG_INFO() legendObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(legendObj, __construct) @@ -3042,9 +3042,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/legend.c MapServer-rel-7-6-2-new/ma MAPSCRIPT_INIT_PARENT(php_legend->parent); php_legend->outlinecolor = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/line.c MapServer-rel-7-6-2-new/mapscript/php/line.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/line.c MapServer-rel-7-6-2-new/mapscript/php/line.c --- MapServer-rel-7-6-2/mapscript/php/line.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/line.c 2021-03-05 22:37:39.178990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/line.c 2021-03-08 12:17:14.386289040 +0100 @@ -90,7 +90,7 @@ PHP_METHOD(lineObj, __construct) php_line = MAPSCRIPT_OBJ_P(php_line_object, getThis()); @@ -3267,9 +3267,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/line.c MapServer-rel-7-6-2-new/maps php_line_new->line = lineObj_clone(php_line_old->line); -diff -rupN MapServer-rel-7-6-2/mapscript/php/map.c MapServer-rel-7-6-2-new/mapscript/php/map.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/map.c MapServer-rel-7-6-2-new/mapscript/php/map.c --- MapServer-rel-7-6-2/mapscript/php/map.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/map.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/map.c 2021-03-08 12:17:14.387289040 +0100 @@ -35,7 +35,7 @@ zend_class_entry *mapscript_ce_map; zend_object_handlers mapscript_map_object_handlers; @@ -4626,9 +4626,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/map.c MapServer-rel-7-6-2-new/mapsc php_map_new->map = mapObj_clone(php_map_old->map); -diff -rupN MapServer-rel-7-6-2/mapscript/php/mapscript_error.c MapServer-rel-7-6-2-new/mapscript/php/mapscript_error.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/mapscript_error.c MapServer-rel-7-6-2-new/mapscript/php/mapscript_error.c --- MapServer-rel-7-6-2/mapscript/php/mapscript_error.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/mapscript_error.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/mapscript_error.c 2021-03-08 12:17:14.387289040 +0100 @@ -38,9 +38,9 @@ zend_class_entry *mapscript_ce_mapscriptexception; @@ -4713,9 +4713,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/mapscript_error.c MapServer-rel-7-6 #endif return SUCCESS; -diff -rupN MapServer-rel-7-6-2/mapscript/php/outputformat.c MapServer-rel-7-6-2-new/mapscript/php/outputformat.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/outputformat.c MapServer-rel-7-6-2-new/mapscript/php/outputformat.c --- MapServer-rel-7-6-2/mapscript/php/outputformat.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/outputformat.c 2021-03-05 22:37:39.184990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/outputformat.c 2021-03-08 12:17:14.388289040 +0100 @@ -75,7 +75,7 @@ PHP_METHOD(outputFormatObj, __construct) long name_len = 0; @@ -4881,9 +4881,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/outputformat.c MapServer-rel-7-6-2- php_outputformat->is_ref = 0; MAPSCRIPT_INIT_PARENT(php_outputformat->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/owsrequest.c MapServer-rel-7-6-2-new/mapscript/php/owsrequest.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/owsrequest.c MapServer-rel-7-6-2-new/mapscript/php/owsrequest.c --- MapServer-rel-7-6-2/mapscript/php/owsrequest.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/owsrequest.c 2021-03-05 22:37:39.175990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/owsrequest.c 2021-03-08 12:17:14.388289040 +0100 @@ -92,7 +92,7 @@ PHP_METHOD(OWSRequestObj, __construct) php_owsrequest = MAPSCRIPT_OBJ_P(php_owsrequest_object, zobj); @@ -5074,9 +5074,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/owsrequest.c MapServer-rel-7-6-2-ne return retval; } -diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript.c MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/php_mapscript.c MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.c --- MapServer-rel-7-6-2/mapscript/php/php_mapscript.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.c 2021-03-05 22:37:39.183990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.c 2021-03-08 12:17:14.388289040 +0100 @@ -128,7 +128,7 @@ PHP_FUNCTION(ms_newMapObj) mapObj *map = NULL; @@ -5445,9 +5445,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript.c MapServer-rel-7-6-2 return FAILURE; } -diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript.h MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.h +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/php_mapscript.h MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.h --- MapServer-rel-7-6-2/mapscript/php/php_mapscript.h 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.h 2021-03-05 22:37:39.176990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript.h 2021-03-08 12:17:14.389289040 +0100 @@ -101,8 +101,8 @@ #define MAPSCRIPT_ZVAL zval* #define MAPSCRIPT_ZVAL_P zval** @@ -5596,9 +5596,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript.h MapServer-rel-7-6-2 /*===================================================================== * Internal functions from mapscript_i.c -diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.c MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.c MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.c --- MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.c 2021-03-05 22:37:39.178990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.c 2021-03-08 12:17:14.389289040 +0100 @@ -34,7 +34,7 @@ #if PHP_VERSION_ID < 70000 zend_object_value mapscript_object_new(zend_object *zobj, @@ -5723,9 +5723,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.c MapServer-rel- + mapscript_create_labelleader((labelLeaderObj*)internal_object, p, mapscript_fetch_object_return_value); } -diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.h MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.h +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.h MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.h --- MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.h 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.h 2021-03-05 22:37:39.176990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/php_mapscript_util.h 2021-03-08 12:17:14.389289040 +0100 @@ -40,9 +40,9 @@ #if ZEND_MODULE_API_NO < 20010901 @@ -5800,9 +5800,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/php_mapscript_util.h MapServer-rel- #endif /* PHP_VERSION_ID < 70000 */ int mapscript_extract_associative_array(HashTable *php, char **array); -diff -rupN MapServer-rel-7-6-2/mapscript/php/point.c MapServer-rel-7-6-2-new/mapscript/php/point.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/point.c MapServer-rel-7-6-2-new/mapscript/php/point.c --- MapServer-rel-7-6-2/mapscript/php/point.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/point.c 2021-03-05 22:37:39.179990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/point.c 2021-03-08 12:17:14.389289040 +0100 @@ -100,7 +100,7 @@ PHP_METHOD(pointObj, __construct) php_point = MAPSCRIPT_OBJ_P(php_point_object, getThis()); @@ -5999,9 +5999,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/point.c MapServer-rel-7-6-2-new/map php_point->is_ref = 0; MAPSCRIPT_INIT_PARENT(php_point->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/projection.c MapServer-rel-7-6-2-new/mapscript/php/projection.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/projection.c MapServer-rel-7-6-2-new/mapscript/php/projection.c --- MapServer-rel-7-6-2/mapscript/php/projection.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/projection.c 2021-03-05 22:37:39.182990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/projection.c 2021-03-08 12:17:14.389289040 +0100 @@ -51,7 +51,7 @@ PHP_METHOD(projectionObj, __construct) php_projection_object *php_projection; @@ -6116,9 +6116,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/projection.c MapServer-rel-7-6-2-ne php_projection_new->projection = projectionObj_clone(php_projection_old->projection); -diff -rupN MapServer-rel-7-6-2/mapscript/php/querymap.c MapServer-rel-7-6-2-new/mapscript/php/querymap.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/querymap.c MapServer-rel-7-6-2-new/mapscript/php/querymap.c --- MapServer-rel-7-6-2/mapscript/php/querymap.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/querymap.c 2021-03-05 22:37:39.180990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/querymap.c 2021-03-08 12:17:14.389289040 +0100 @@ -53,7 +53,7 @@ ZEND_END_ARG_INFO() queryMapObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(queryMapObj, __construct) @@ -6246,9 +6246,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/querymap.c MapServer-rel-7-6-2-new/ MAPSCRIPT_INIT_PARENT(php_querymap->parent); php_querymap->color = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/rect.c MapServer-rel-7-6-2-new/mapscript/php/rect.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/rect.c MapServer-rel-7-6-2-new/mapscript/php/rect.c --- MapServer-rel-7-6-2/mapscript/php/rect.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/rect.c 2021-03-05 22:37:39.176990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/rect.c 2021-03-08 12:17:14.390289040 +0100 @@ -86,7 +86,7 @@ PHP_METHOD(rectObj, __construct) php_rect = MAPSCRIPT_OBJ_P(php_rect_object, getThis()); @@ -6436,9 +6436,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/rect.c MapServer-rel-7-6-2-new/maps php_rect->is_ref = 0; MAPSCRIPT_INIT_PARENT(php_rect->parent) -diff -rupN MapServer-rel-7-6-2/mapscript/php/referencemap.c MapServer-rel-7-6-2-new/mapscript/php/referencemap.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/referencemap.c MapServer-rel-7-6-2-new/mapscript/php/referencemap.c --- MapServer-rel-7-6-2/mapscript/php/referencemap.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/referencemap.c 2021-03-05 22:37:39.177990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/referencemap.c 2021-03-08 12:17:14.390289040 +0100 @@ -53,7 +53,7 @@ ZEND_END_ARG_INFO() referenceMapObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(referenceMapObj, __construct) @@ -6566,9 +6566,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/referencemap.c MapServer-rel-7-6-2- MAPSCRIPT_INIT_PARENT(php_referencemap->parent); php_referencemap->extent = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/result.c MapServer-rel-7-6-2-new/mapscript/php/result.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/result.c MapServer-rel-7-6-2-new/mapscript/php/result.c --- MapServer-rel-7-6-2/mapscript/php/result.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/result.c 2021-03-05 22:37:39.181990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/result.c 2021-03-08 12:17:14.390289040 +0100 @@ -58,7 +58,7 @@ PHP_METHOD(resultObj, __construct) php_result_object *php_result; @@ -6687,9 +6687,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/result.c MapServer-rel-7-6-2-new/ma MAPSCRIPT_INIT_PARENT(php_result->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/scalebar.c MapServer-rel-7-6-2-new/mapscript/php/scalebar.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/scalebar.c MapServer-rel-7-6-2-new/mapscript/php/scalebar.c --- MapServer-rel-7-6-2/mapscript/php/scalebar.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/scalebar.c 2021-03-05 22:37:39.175990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/scalebar.c 2021-03-08 12:17:14.390289040 +0100 @@ -59,7 +59,7 @@ ZEND_END_ARG_INFO() scalebarObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(scalebarObj, __construct) @@ -6826,9 +6826,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/scalebar.c MapServer-rel-7-6-2-new/ MAPSCRIPT_INIT_PARENT(php_scalebar->parent); php_scalebar->color = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/shape.c MapServer-rel-7-6-2-new/mapscript/php/shape.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/shape.c MapServer-rel-7-6-2-new/mapscript/php/shape.c --- MapServer-rel-7-6-2/mapscript/php/shape.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/shape.c 2021-03-05 22:37:39.180990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/shape.c 2021-03-08 12:17:14.391289039 +0100 @@ -162,7 +162,7 @@ PHP_METHOD(shapeObj, __construct) long type; @@ -7331,9 +7331,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/shape.c MapServer-rel-7-6-2-new/map php_shape->is_ref = 0; MAPSCRIPT_INIT_PARENT(php_shape->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/shapefile.c MapServer-rel-7-6-2-new/mapscript/php/shapefile.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/shapefile.c MapServer-rel-7-6-2-new/mapscript/php/shapefile.c --- MapServer-rel-7-6-2/mapscript/php/shapefile.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/shapefile.c 2021-03-05 22:37:39.179990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/shapefile.c 2021-03-08 12:17:14.391289039 +0100 @@ -86,7 +86,7 @@ PHP_METHOD(shapeFileObj, __construct) long type; @@ -7594,9 +7594,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/shapefile.c MapServer-rel-7-6-2-new php_shapefile->bounds = NULL; -diff -rupN MapServer-rel-7-6-2/mapscript/php/style.c MapServer-rel-7-6-2-new/mapscript/php/style.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/style.c MapServer-rel-7-6-2-new/mapscript/php/style.c --- MapServer-rel-7-6-2/mapscript/php/style.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/style.c 2021-03-05 22:37:39.174990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/style.c 2021-03-08 12:17:14.391289039 +0100 @@ -86,7 +86,7 @@ PHP_METHOD(styleObj, __construct) parent_object parent; @@ -7891,9 +7891,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/style.c MapServer-rel-7-6-2-new/map php_style_new->style = styleObj_clone(php_style_old->style); -diff -rupN MapServer-rel-7-6-2/mapscript/php/symbol.c MapServer-rel-7-6-2-new/mapscript/php/symbol.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/symbol.c MapServer-rel-7-6-2-new/mapscript/php/symbol.c --- MapServer-rel-7-6-2/mapscript/php/symbol.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/symbol.c 2021-03-05 22:37:39.177990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/symbol.c 2021-03-08 12:17:14.391289039 +0100 @@ -79,7 +79,7 @@ PHP_METHOD(symbolObj, __construct) parent_object parent; @@ -8084,9 +8084,9 @@ diff -rupN MapServer-rel-7-6-2/mapscript/php/symbol.c MapServer-rel-7-6-2-new/ma MAPSCRIPT_INIT_PARENT(php_symbol->parent); -diff -rupN MapServer-rel-7-6-2/mapscript/php/web.c MapServer-rel-7-6-2-new/mapscript/php/web.c +diff -rupN --no-dereference MapServer-rel-7-6-2/mapscript/php/web.c MapServer-rel-7-6-2-new/mapscript/php/web.c --- MapServer-rel-7-6-2/mapscript/php/web.c 2020-12-07 21:09:40.000000000 +0100 -+++ MapServer-rel-7-6-2-new/mapscript/php/web.c 2021-03-05 22:37:39.178990978 +0100 ++++ MapServer-rel-7-6-2-new/mapscript/php/web.c 2021-03-08 12:17:14.392289039 +0100 @@ -53,7 +53,7 @@ ZEND_END_ARG_INFO() webObj CANNOT be instanciated, this will throw an exception on use */ PHP_METHOD(webObj, __construct) diff --git a/mapserver_proj8.patch b/mapserver_proj8.patch new file mode 100644 index 0000000..fd7f90e --- /dev/null +++ b/mapserver_proj8.patch @@ -0,0 +1,12 @@ +diff -rupN --no-dereference MapServer-rel-7-6-2/cmake/FindProj.cmake MapServer-rel-7-6-2-new/cmake/FindProj.cmake +--- MapServer-rel-7-6-2/cmake/FindProj.cmake 2020-12-07 21:09:40.000000000 +0100 ++++ MapServer-rel-7-6-2-new/cmake/FindProj.cmake 2021-03-08 12:17:14.492289032 +0100 +@@ -6,7 +6,7 @@ + # PROJ_LIBRARY + + +-FIND_PATH(PROJ_INCLUDE_DIR proj_api.h) ++FIND_PATH(PROJ_INCLUDE_DIR proj.h) + + FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i) +