jengelh/mapserver
SHA256
1
0
Fork 0
forked from pool/mapserver
Code Pull Requests Activity

Accepting request 358212 from home:Guillaume_G:branches:Application:Geo

Browse Source 
Fix Tumbleweed and 13.1 builds

OBS-URL: https://build.opensuse.org/request/show/358212
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=100
This commit is contained in:
Angelos Tzotsos 2016-02-07 18:25:10 +00:00 committed by Git OBS Bridge
parent 874c236c53
commit f52bfdff10
4 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
giflib_5.1.0.patch Normal file
View File

@ -0,0 +1,14 @@
--- mapimageio.c.orig 2016-02-05 15:03:30.375271083 +0100
+++ mapimageio.c 2016-02-05 15:15:29.994938301 +0100
@@ -1303,7 +1303,11 @@ int readGIF(char *path, rasterBufferObj
} while (recordType != TERMINATE_RECORD_TYPE);
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5 && defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+ if (DGifCloseFile(image, &errcode) == GIF_ERROR) {
+#else
if (DGifCloseFile(image) == GIF_ERROR) {
+#endif
#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
msSetError(MS_MISCERR,"failed to close gif after loading: %s","readGIF()", gif_error_msg(image->Error));
#else

12
mapserver.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Feb 5 14:22:24 UTC 2016 - guillaume@opensuse.org
- Fix build when 'php_mapscript.so' is only file installed and no
*.so.1 and *.so%{version} (Fix openSUSE 13.1 build)
-------------------------------------------------------------------
Fri Feb 5 14:10:02 UTC 2016 - guillaume@opensuse.org
- Add giflib_5.1.0.patch to fix compilation with giflib 5.1.0+
- Add swig_3.patch to fix compilation with swig 3
-------------------------------------------------------------------
Sat Aug 30 18:34:09 UTC 2014 - bruno@ioda-net.ch

9
mapserver.spec
View File

@ -40,6 +40,9 @@ Patch2: 4788-php-mapscript.patch
Patch3: 4788-python-mapscript.patch
Patch4: 4875-incorrect-blending-tif.patch
Patch5: 4912-php56-php-input.patch
# Fix Build with GIFLIB >= 5.1.0
Patch6: giflib_5.1.0.patch
Patch7: swig_3.patch
BuildRequires: FastCGI-devel
BuildRequires: apache2-devel
BuildRequires: autoconf
@ -208,6 +211,8 @@ against the C Mapserver library.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p0
%patch7 -p0
%build -n %{name}-%{fileversion}
@ -361,9 +366,7 @@ rm -rf %{buildroot}
%doc mapscript/php/README
%doc mapscript/php/examples
%config(noreplace) %{_sysconfdir}/php5/conf.d/mapscript.ini
%{_libdir}/php5/extensions/php_mapscript.so
%{_libdir}/php5/extensions/php_mapscript.so.1
%{_libdir}/php5/extensions/php_mapscript.so.%{version}
%{_libdir}/php5/extensions/php_mapscript.so*
%files -n perl-mapscript
%defattr(-,root,root)

17
swig_3.patch Normal file
View File

@ -0,0 +1,17 @@
--- mapscript/java/javamodule.i.orig 2016-02-05 15:33:04.687868919 +0100
+++ mapscript/java/javamodule.i 2016-02-05 15:37:36.364273961 +0100
@@ -1,9 +1,11 @@
%include arrays_java.i
-# Uncomment this if you wish to hace enums wrapped in an interface compatible
-# with that generated by swig 1.3.21 (tests wont compile, though)
-#%include enumsimple.swg
+/*
+# Uncomment this if you wish to hace enums wrapped in an interface compatible
+# with that generated by swig 1.3.21 (tests wont compile, though)
+#%include enumsimple.swg
+*/
/* Mapscript library loader */