| 1 |
commit: 8bb33bb6fe727bdf789ecd7475d573569aeb585a |
| 2 |
Author: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 27 12:26:19 2016 +0000 |
| 4 |
Commit: Amy Winston <amynka <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 27 12:26:19 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb33bb6 |
| 7 |
|
| 8 |
sci-geosciences/mapserver: drop unused old patches |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.26 |
| 11 |
|
| 12 |
.../mapserver/files/5.4.2-ldflags.patch | 90 ---------------------- |
| 13 |
.../mapserver/files/6.0.0_rc1-bool.patch | 23 ------ |
| 14 |
.../mapserver/files/6.0.0_rc1-ldflags.patch | 89 --------------------- |
| 15 |
.../mapserver/files/6.0.0_rc1-php_ldflags.patch | 15 ---- |
| 16 |
.../mapserver/files/6.1.0-php-5.4.patch | 69 ----------------- |
| 17 |
.../mapserver/files/mapserver_tcl.patch-r1 | 44 ----------- |
| 18 |
6 files changed, 330 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch b/sci-geosciences/mapserver/files/5.4.2-ldflags.patch |
| 21 |
deleted file mode 100644 |
| 22 |
index d202b8d..0000000 |
| 23 |
--- a/sci-geosciences/mapserver/files/5.4.2-ldflags.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,90 +0,0 @@ |
| 26 |
-diff --git a/Makefile.in b/Makefile.in |
| 27 |
-index 56cb209..46a8a4c 100755 |
| 28 |
---- a/Makefile.in |
| 29 |
-+++ b/Makefile.in |
| 30 |
-@@ -252,7 +252,7 @@ SUP_LIBS = $(GD_LIB) $(AGG_LIB) $(PDF_LIB) $(TIFF_LIB) $(PROJ_LIBS) \ |
| 31 |
- # STATIC_LIBS is full filename with path of libs that will be statically linked |
| 32 |
- STATIC_LIBS= $(GD_STATIC) |
| 33 |
- |
| 34 |
--EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 35 |
-+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 36 |
- |
| 37 |
- RM= /bin/rm -f |
| 38 |
- |
| 39 |
-@@ -316,59 +316,59 @@ $(LIBMAP_SHARED): $(LIBMAP_STATIC) |
| 40 |
- && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) |
| 41 |
- |
| 42 |
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h |
| 43 |
-- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf |
| 44 |
-+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) |
| 45 |
- |
| 46 |
- shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h |
| 47 |
-- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img |
| 48 |
-+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) |
| 49 |
- |
| 50 |
- sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h |
| 51 |
-- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img |
| 52 |
-+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) |
| 53 |
- |
| 54 |
- legend: $(LIBMAP_STATIC) legend.o mapserver.h |
| 55 |
-- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend |
| 56 |
-+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) |
| 57 |
- |
| 58 |
- scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h |
| 59 |
-- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar |
| 60 |
-+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) |
| 61 |
- |
| 62 |
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h |
| 63 |
-- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv |
| 64 |
-+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) |
| 65 |
- |
| 66 |
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h |
| 67 |
-- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex |
| 68 |
-+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) |
| 69 |
- |
| 70 |
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h |
| 71 |
-- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree |
| 72 |
-+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) |
| 73 |
- |
| 74 |
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h |
| 75 |
-- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis |
| 76 |
-+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) |
| 77 |
- |
| 78 |
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h |
| 79 |
-- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst |
| 80 |
-+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) |
| 81 |
- |
| 82 |
- sortshp: sortshp.o |
| 83 |
-- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp |
| 84 |
-+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) |
| 85 |
- |
| 86 |
- tile4ms: tile4ms.o |
| 87 |
-- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms |
| 88 |
-+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) |
| 89 |
- |
| 90 |
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h |
| 91 |
-- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt |
| 92 |
-+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) |
| 93 |
- |
| 94 |
- testexpr: testexpr.o mapparser.o maplexer.o |
| 95 |
-- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr |
| 96 |
-+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) |
| 97 |
- |
| 98 |
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h |
| 99 |
-- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy |
| 100 |
-+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) |
| 101 |
- |
| 102 |
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c |
| 103 |
-- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto |
| 104 |
-+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) |
| 105 |
- |
| 106 |
- mapscriptvars: Makefile |
| 107 |
- touch mapscriptvars |
| 108 |
- pwd > mapscriptvars |
| 109 |
- echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars |
| 110 |
- echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(TIFF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars |
| 111 |
-- echo $(EXE_LDFLAGS) >> mapscriptvars |
| 112 |
-+ echo $(LDFLAGS) >> mapscriptvars |
| 113 |
- echo $(STATIC_LIBS) >> mapscriptvars |
| 114 |
- grep '#define MS_VERSION ' mapserver.h >> mapscriptvars |
| 115 |
- |
| 116 |
|
| 117 |
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch |
| 118 |
deleted file mode 100644 |
| 119 |
index 8016961..0000000 |
| 120 |
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-bool.patch |
| 121 |
+++ /dev/null |
| 122 |
@@ -1,23 +0,0 @@ |
| 123 |
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/bool.h mapserver-6.0.0-rc1/mapscript/php/bool.h |
| 124 |
---- mapserver-6.0.0-rc1.old/mapscript/php/bool.h 1970-01-01 01:00:00.000000000 +0100 |
| 125 |
-+++ mapserver-6.0.0-rc1/mapscript/php/bool.h 2011-05-02 22:00:00.000000000 +0200 |
| 126 |
-@@ -0,0 +1,8 @@ |
| 127 |
-+#ifndef BOOL_H |
| 128 |
-+#define BOOL_H |
| 129 |
-+ |
| 130 |
-+#define bool_t int |
| 131 |
-+#define TRUE 1 |
| 132 |
-+#define FALSE 0 |
| 133 |
-+ |
| 134 |
-+#endif /* BOOL_H */ |
| 135 |
-diff -urN mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h |
| 136 |
---- mapserver-6.0.0-rc1.old/mapscript/php/php_mapscript.h 2011-05-02 12:10:03.000000000 +0200 |
| 137 |
-+++ mapserver-6.0.0-rc1/mapscript/php/php_mapscript.h 2011-05-02 22:00:11.000000000 +0200 |
| 138 |
-@@ -32,6 +32,7 @@ |
| 139 |
- #ifndef PHP_MAPSCRIPT_H |
| 140 |
- #define PHP_MAPSCRIPT_H |
| 141 |
- |
| 142 |
-+#include "bool.h" |
| 143 |
- #include "php.h" |
| 144 |
- #include "zend_interfaces.h" |
| 145 |
- #include "php_mapscript_util.h" |
| 146 |
|
| 147 |
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch |
| 148 |
deleted file mode 100644 |
| 149 |
index 336fb2e..0000000 |
| 150 |
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-ldflags.patch |
| 151 |
+++ /dev/null |
| 152 |
@@ -1,89 +0,0 @@ |
| 153 |
-diff -urN mapserver-6.0.0-rc1.old/Makefile.in mapserver-6.0.0-rc1/Makefile.in |
| 154 |
---- mapserver-6.0.0-rc1.old/Makefile.in 2011-05-02 12:10:03.000000000 +0200 |
| 155 |
-+++ mapserver-6.0.0-rc1/Makefile.in 2011-05-02 16:29:31.000000000 +0200 |
| 156 |
-@@ -264,7 +264,7 @@ |
| 157 |
- # STATIC_LIBS is full filename with path of libs that will be statically linked |
| 158 |
- STATIC_LIBS= $(GD_STATIC) |
| 159 |
- |
| 160 |
--EXE_LDFLAGS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 161 |
-+EXE_LIBS = $(RUNPATHS) -L. -lmapserver $(SUP_LIBS) $(STATIC_LIBS) |
| 162 |
- |
| 163 |
- RM= /bin/rm -f |
| 164 |
- |
| 165 |
-@@ -351,59 +351,59 @@ |
| 166 |
- && ln -f -s $(LIBMAP_SH_VER) $(LIBMAP_SHARED) |
| 167 |
- |
| 168 |
- shp2pdf: $(LIBMAP_STATIC) shp2pdf.o mapserver.h |
| 169 |
-- $(LD) $(CFLAGS) shp2pdf.o $(EXE_LDFLAGS) -o shp2pdf |
| 170 |
-+ $(LD) $(CFLAGS) shp2pdf.o $(LDFLAGS) -o shp2pdf $(EXE_LIBS) |
| 171 |
- |
| 172 |
- shp2img: $(LIBMAP_STATIC) shp2img.o mapserver.h |
| 173 |
-- $(LD) $(CFLAGS) shp2img.o $(EXE_LDFLAGS) -o shp2img |
| 174 |
-+ $(LD) $(CFLAGS) shp2img.o $(LDFLAGS) -o shp2img $(EXE_LIBS) |
| 175 |
- |
| 176 |
- sym2img: $(LIBMAP_STATIC) sym2img.o mapserver.h |
| 177 |
-- $(LD) $(CFLAGS) sym2img.o $(EXE_LDFLAGS) -o sym2img |
| 178 |
-+ $(LD) $(CFLAGS) sym2img.o $(LDFLAGS) -o sym2img $(EXE_LIBS) |
| 179 |
- |
| 180 |
- legend: $(LIBMAP_STATIC) legend.o mapserver.h |
| 181 |
-- $(LD) $(CFLAGS) legend.o $(EXE_LDFLAGS) -o legend |
| 182 |
-+ $(LD) $(CFLAGS) legend.o $(LDFLAGS) -o legend $(EXE_LIBS) |
| 183 |
- |
| 184 |
- scalebar: $(LIBMAP_STATIC) scalebar.o mapserver.h |
| 185 |
-- $(LD) $(CFLAGS) scalebar.o $(EXE_LDFLAGS) -o scalebar |
| 186 |
-+ $(LD) $(CFLAGS) scalebar.o $(LDFLAGS) -o scalebar $(EXE_LIBS) |
| 187 |
- |
| 188 |
- mapserv: mapserv.h maptile.h $(LIBMAP_STATIC) mapserv.o cgiutil.o maptile.o mapserver.h |
| 189 |
-- $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(EXE_LDFLAGS) -o mapserv |
| 190 |
-+ $(LD) $(CFLAGS) mapserv.o cgiutil.o maptile.o $(LDFLAGS) -o mapserv $(EXE_LIBS) |
| 191 |
- |
| 192 |
- shpindex: $(LIBMAP_STATIC) shpindex.o mapserver.h |
| 193 |
-- $(LD) $(CFLAGS) shpindex.o $(EXE_LDFLAGS) -o shpindex |
| 194 |
-+ $(LD) $(CFLAGS) shpindex.o $(LDFLAGS) -o shpindex $(EXE_LIBS) |
| 195 |
- |
| 196 |
- shptree: $(LIBMAP_STATIC) shptree.o mapserver.h |
| 197 |
-- $(LD) $(CFLAGS) shptree.o $(EXE_LDFLAGS) -o shptree |
| 198 |
-+ $(LD) $(CFLAGS) shptree.o $(LDFLAGS) -o shptree $(EXE_LIBS) |
| 199 |
- |
| 200 |
- shptreevis: $(LIBMAP_STATIC) shptreevis.o mapserver.h |
| 201 |
-- $(LD) $(CFLAGS) shptreevis.o $(EXE_LDFLAGS) -o shptreevis |
| 202 |
-+ $(LD) $(CFLAGS) shptreevis.o $(LDFLAGS) -o shptreevis $(EXE_LIBS) |
| 203 |
- |
| 204 |
- shptreetst: $(LIBMAP_STATIC) shptreetst.o mapserver.h |
| 205 |
-- $(LD) $(CFLAGS) shptreetst.o $(EXE_LDFLAGS) -o shptreetst |
| 206 |
-+ $(LD) $(CFLAGS) shptreetst.o $(LDFLAGS) -o shptreetst $(EXE_LIBS) |
| 207 |
- |
| 208 |
- sortshp: $(LIBMAP_STATIC) sortshp.o mapserver.h |
| 209 |
-- $(LD) $(CFLAGS) sortshp.o $(EXE_LDFLAGS) -o sortshp |
| 210 |
-+ $(LD) $(CFLAGS) sortshp.o $(LDFLAGS) -o sortshp $(EXE_LIBS) |
| 211 |
- |
| 212 |
- tile4ms: $(LIBMAP_STATIC) tile4ms.o mapserver.h |
| 213 |
-- $(LD) $(CFLAGS) tile4ms.o $(EXE_LDFLAGS) -o tile4ms |
| 214 |
-+ $(LD) $(CFLAGS) tile4ms.o $(LDFLAGS) -o tile4ms $(EXE_LIBS) |
| 215 |
- |
| 216 |
- msencrypt: $(LIBMAP_STATIC) msencrypt.o mapserver.h |
| 217 |
-- $(LD) $(CFLAGS) msencrypt.o $(EXE_LDFLAGS) -o msencrypt |
| 218 |
-+ $(LD) $(CFLAGS) msencrypt.o $(LDFLAGS) -o msencrypt $(EXE_LIBS) |
| 219 |
- |
| 220 |
- testexpr: $(LIBMAP_STATIC) testexpr.o mapparser.o maplexer.o mapserver.h |
| 221 |
-- $(LD) $(CFLAGS) testexpr.o $(EXE_LDFLAGS) -o testexpr |
| 222 |
-+ $(LD) $(CFLAGS) testexpr.o $(LDFLAGS) -o testexpr $(EXE_LIBS) |
| 223 |
- |
| 224 |
- testcopy: $(LIBMAP_STATIC) testcopy.o mapcopy.o mapserver.h |
| 225 |
-- $(LD) $(CFLAGS) testcopy.o $(EXE_LDFLAGS) -o testcopy |
| 226 |
-+ $(LD) $(CFLAGS) testcopy.o $(LDFLAGS) -o testcopy $(EXE_LIBS) |
| 227 |
- |
| 228 |
- test_mapcrypto: $(LIBMAP_STATIC) mapcrypto.c mapserver.h |
| 229 |
-- $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(EXE_LDFLAGS) -o test_mapcrypto |
| 230 |
-+ $(CC) $(CFLAGS) mapcrypto.c -DTEST_MAPCRYPTO $(LDFLAGS) -o test_mapcrypto $(EXE_LIBS) |
| 231 |
- |
| 232 |
- mapscriptvars: Makefile |
| 233 |
- touch mapscriptvars |
| 234 |
- pwd > mapscriptvars |
| 235 |
- echo $(IGNORE_MISSING_DATA) $(USE_POINT_Z_M) $(STRINGS) @ALL_ENABLED@ >> mapscriptvars |
| 236 |
- echo -I. $(PROJ_INC) $(GD_INC) $(TTF_INC) $(JPEG_INC) $(SDE_INC) $(OGR_INC) $(GDAL_INC) $(GEOS_INC) >> mapscriptvars |
| 237 |
-- echo $(EXE_LDFLAGS) >> mapscriptvars |
| 238 |
-+ echo $(EXE_LIBS) >> mapscriptvars |
| 239 |
- echo $(STATIC_LIBS) >> mapscriptvars |
| 240 |
- grep '#define MS_VERSION ' mapserver.h >> mapscriptvars |
| 241 |
- |
| 242 |
|
| 243 |
diff --git a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch b/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch |
| 244 |
deleted file mode 100644 |
| 245 |
index 706bae4..0000000 |
| 246 |
--- a/sci-geosciences/mapserver/files/6.0.0_rc1-php_ldflags.patch |
| 247 |
+++ /dev/null |
| 248 |
@@ -1,15 +0,0 @@ |
| 249 |
---- mapserver-6.0.0-rc1.old/mapscript/php/Makefile.in 2011-05-02 12:10:03.000000000 +0200 |
| 250 |
-+++ mapserver-6.0.0-rc1/mapscript/php/Makefile.in 2011-05-02 23:43:15.000000000 +0200 |
| 251 |
-@@ -86,10 +86,10 @@ |
| 252 |
- |
| 253 |
- |
| 254 |
- php_mapscript.so: $(PHPMS_OBJS) ../../libmapserver.a |
| 255 |
-- $(LD) -o $@ $(PHPMS_OBJS) $(MS_LIBS) |
| 256 |
-+ $(LD) -o $@ $(LDFLAGS) $(PHPMS_OBJS) $(MS_LIBS) |
| 257 |
- |
| 258 |
- php_proj.so: $(PHPPROJ_OBJS) |
| 259 |
-- $(LD) -o $@ $(PHPPROJ_OBJS) $(MS_LIBS) |
| 260 |
-+ $(LD) -o $@ $(LDFLAGS) $(PHPPROJ_OBJS) $(MS_LIBS) |
| 261 |
- |
| 262 |
- %.o: %.c php_mapscript_util.h php_mapscript.h |
| 263 |
- $(CC) $(CFLAGS112) -c -o $@ $< |
| 264 |
|
| 265 |
diff --git a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch b/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch |
| 266 |
deleted file mode 100644 |
| 267 |
index e81fd90..0000000 |
| 268 |
--- a/sci-geosciences/mapserver/files/6.1.0-php-5.4.patch |
| 269 |
+++ /dev/null |
| 270 |
@@ -1,69 +0,0 @@ |
| 271 |
-diff -aurN mapserver-6.0.1.orig/mapscript/php/image.c mapserver-6.0.1/mapscript/php/image.c |
| 272 |
---- mapserver-6.0.1.orig/mapscript/php/image.c 2011-04-05 11:15:06.000000000 -0400 |
| 273 |
-+++ mapserver-6.0.1/mapscript/php/image.c 2015-02-04 14:29:03.164357015 -0500 |
| 274 |
-@@ -303,10 +303,18 @@ |
| 275 |
- /* no filename - read stdout */ |
| 276 |
- |
| 277 |
- /* if there is no output buffer active, set the header */ |
| 278 |
-- if (OG(ob_nesting_level)<=0) |
| 279 |
-- { |
| 280 |
-- php_header(TSRMLS_C); |
| 281 |
-- } |
| 282 |
-+ //handle changes in PHP 5.4.x |
| 283 |
-+ #if PHP_VERSION_ID < 50399 |
| 284 |
-+ if (OG(ob_nesting_level)<=0) |
| 285 |
-+ { |
| 286 |
-+ php_header(TSRMLS_C); |
| 287 |
-+ } |
| 288 |
-+ #else |
| 289 |
-+ if (php_output_get_level(TSRMLS_C)<=0) |
| 290 |
-+ { |
| 291 |
-+ php_header(TSRMLS_C); |
| 292 |
-+ } |
| 293 |
-+ #endif |
| 294 |
- |
| 295 |
- |
| 296 |
- if (MS_RENDERER_PLUGIN(php_image->image->format)) |
| 297 |
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript.c mapserver-6.0.1/mapscript/php/php_mapscript.c |
| 298 |
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript.c 2011-04-05 23:05:02.000000000 -0400 |
| 299 |
-+++ mapserver-6.0.1/mapscript/php/php_mapscript.c 2015-02-04 14:27:52.296567202 -0500 |
| 300 |
-@@ -899,7 +899,7 @@ |
| 301 |
- |
| 302 |
- } |
| 303 |
- |
| 304 |
--function_entry mapscript_functions[] = { |
| 305 |
-+zend_function_entry mapscript_functions[] = { |
| 306 |
- PHP_FE(ms_GetVersion, NULL) |
| 307 |
- PHP_FE(ms_GetVersionInt, NULL) |
| 308 |
- PHP_FE(ms_newLineObj, NULL) |
| 309 |
-diff -aurN mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c mapserver-6.0.1/mapscript/php/php_mapscript_util.c |
| 310 |
---- mapserver-6.0.1.orig/mapscript/php/php_mapscript_util.c 2011-04-04 13:50:20.000000000 -0400 |
| 311 |
-+++ mapserver-6.0.1/mapscript/php/php_mapscript_util.c 2015-02-04 14:27:27.477341249 -0500 |
| 312 |
-@@ -42,7 +42,12 @@ |
| 313 |
- zobj->ce = ce; |
| 314 |
- ALLOC_HASHTABLE(zobj->properties); |
| 315 |
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0); |
| 316 |
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); |
| 317 |
-+ //handle changes in PHP 5.4.x |
| 318 |
-+ #if PHP_VERSION_ID < 50399 |
| 319 |
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); |
| 320 |
-+ #else |
| 321 |
-+ object_properties_init(zobj, ce); |
| 322 |
-+ #endif |
| 323 |
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC); |
| 324 |
- retval.handlers = &mapscript_std_object_handlers; |
| 325 |
- return retval; |
| 326 |
-@@ -59,7 +64,12 @@ |
| 327 |
- zobj->ce = ce; |
| 328 |
- ALLOC_HASHTABLE(zobj->properties); |
| 329 |
- zend_hash_init(zobj->properties, 0, NULL, ZVAL_PTR_DTOR, 0); |
| 330 |
-- zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); |
| 331 |
-+ //handle changes in PHP 5.4.x |
| 332 |
-+ #if PHP_VERSION_ID < 50399 |
| 333 |
-+ zend_hash_copy(zobj->properties, &ce->default_properties, (copy_ctor_func_t) zval_add_ref,(void *) &temp, sizeof(zval *)); |
| 334 |
-+ #else |
| 335 |
-+ object_properties_init(zobj, ce); |
| 336 |
-+ #endif |
| 337 |
- retval.handle = zend_objects_store_put(zobj, NULL, (zend_objects_free_object_storage_t)zend_objects_free_object, NULL TSRMLS_CC); |
| 338 |
- retval.handlers = object_handlers; |
| 339 |
- return retval; |
| 340 |
|
| 341 |
diff --git a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 b/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 |
| 342 |
deleted file mode 100644 |
| 343 |
index 845cad6..0000000 |
| 344 |
--- a/sci-geosciences/mapserver/files/mapserver_tcl.patch-r1 |
| 345 |
+++ /dev/null |
| 346 |
@@ -1,44 +0,0 @@ |
| 347 |
---- mapscript/tcl/Makefile.in.orig 2001-10-26 00:56:39.000000000 +0200 |
| 348 |
-+++ mapscript/tcl/Makefile.in 2008-02-04 11:04:22.000000000 +0100 |
| 349 |
-@@ -25,7 +25,7 @@ |
| 350 |
- TCL_LIBS = @TCL_LIBS@ |
| 351 |
- LIBS = @TCL_LIBS@ |
| 352 |
- TCL_DBGX = @TCL_DBGX@ |
| 353 |
--LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/lib:@TCL_EXEC_PREFIX@/lib/$(PACKAGEDIR):@TCL_PREFIX@/lib:@MAPSERVERHOME@ |
| 354 |
-+LIB_RUNTIME_DIR = @TCL_EXEC_PREFIX@/@libdir@:@TCL_EXEC_PREFIX@/@libdir@/$(PACKAGEDIR):@TCL_PREFIX@/@libdir@:@MAPSERVERHOME@ |
| 355 |
- |
| 356 |
- MAPSERVERHOME = @MAPSERVERHOME@ |
| 357 |
- MAPSERVERDEFS = @MAPSERVERDEFS@ |
| 358 |
-@@ -69,14 +69,14 @@ |
| 359 |
- $(DLTARGET)$(TCL_SHLIB_SUFFIX): mapscript_wrap.o |
| 360 |
- |
| 361 |
- install: $(DLTARGET)$(TCL_SHLIB_SUFFIX) |
| 362 |
-- -mkdir $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 363 |
-- cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 364 |
-+ -mkdir $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 365 |
-+ cp $(DLTARGET)$(TCL_SHLIB_SUFFIX) $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 366 |
- chmod +x \ |
| 367 |
-- $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX) |
| 368 |
-- cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 369 |
-- cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 370 |
-- cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 371 |
-- cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/lib/$(PACKAGEDIR) |
| 372 |
-+ $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR)/$(DLTARGET)$(TCL_SHLIB_SUFFIX) |
| 373 |
-+ cp pkgIndex.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 374 |
-+ cp mapscriptsupp.tcl $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 375 |
-+ cp mapscriptsupp.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 376 |
-+ cp mapscript_wrap.html $(TCL_EXEC_PREFIX)/@libdir@/$(PACKAGEDIR) |
| 377 |
- |
| 378 |
- |
| 379 |
- useprebuilt: |
| 380 |
---- mapscript/mapscript.i 2005-11-22 22:44:48.000000000 +0100 |
| 381 |
-+++ mapscript/mapscript.i 2006-04-12 23:47:23.000000000 +0200 |
| 382 |
-@@ -206,7 +206,7 @@ |
| 383 |
- |
| 384 |
- /* Tcl */ |
| 385 |
- #ifdef SWIGTCL8 |
| 386 |
--%include "tclmodule.i" |
| 387 |
-+/* %include "tclmodule.i" */ |
| 388 |
- #endif /* SWIGTCL8 */ |
| 389 |
- |
| 390 |
- /* |
Archives