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

Added build-patch from #3877

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/mapserver?expand=0&rev=74
This commit is contained in:
Bjoern Schilberg 2011-05-27 10:31:50 +00:00 committed by Git OBS Bridge
parent f4d61da2a5
commit 09a71643f7
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mapserver.spec
View File

@ -63,7 +63,7 @@ BuildRequires: krb5-devel
BuildRequires: libgcj-devel BuildRequires: libgcj-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Patch0: mapserver-5.4.1_buildchecks.patch Patch0: mapserver-5.4.1_buildchecks.patch
#Patch1: hidden_layer.patch Patch1: patch_3877-r11714.patch
#Patch2: bug3525_verbose_output.patch #Patch2: bug3525_verbose_output.patch
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@ -115,7 +115,7 @@ within the Java programming language.
%prep %prep
%setup -q -n %{name}-%{fileversion} %setup -q -n %{name}-%{fileversion}
%patch0 -p1 %patch0 -p1
#%patch1 -p1 %patch1 -p0
#%patch2 -p1 #%patch2 -p1
# fix spurious perm bits # fix spurious perm bits
@ -289,6 +289,8 @@ rm -rf %{buildroot}
%{_javadir}/*.jar %{_javadir}/*.jar
%changelog %changelog
* Fri May 27 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0
- included the patch from #3877 to make it build
* Mon May 16 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0 * Mon May 16 2011 Stephan Holl <stephan.holl@intevation.de> 6.0.0
- updated to new upstream version of mapserver 6.0.0 (see - updated to new upstream version of mapserver 6.0.0 (see
http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-0/mapserver/HISTORY.TXT for a detailed description of the changes. http://trac.osgeo.org/mapserver/browser/tags/rel-6-0-0/mapserver/HISTORY.TXT for a detailed description of the changes.

36
patch_3877-r11714.patch Normal file
View File

@ -0,0 +1,36 @@
Index: mapserver-6.0.0/HISTORY.TXT
===================================================================
--- mapserver-6.0.0/HISTORY.TXT (revision 11709)
+++ mapserver-6.0.0/HISTORY.TXT (revision 11714)
@@ -15,4 +15,6 @@
Version 6.0.1 (SVN branch-6-0):
---------------------------
+
+- Fixed the build problem in mapunion.c (#3877)
- Union layer: Fixed the crash when styling source layers using attributes (#3870)
Index: mapserver-6.0.0/mapunion.c
===================================================================
--- mapserver-6.0.0/mapunion.c (revision 11709)
+++ mapserver-6.0.0/mapunion.c (revision 11714)
@@ -316,5 +316,5 @@
/* get items requested by the union layer plus the required items */
msLayerSetProcessingKey(srclayer, "ITEMS", itemlist);
- if (msLayerWhichItems(srclayer, TRUE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_TRUE, NULL) != MS_SUCCESS)
{
msFree(itemlist);
@@ -325,5 +325,5 @@
{
/* get only the required items */
- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
return MS_FAILURE;
}
@@ -354,5 +354,5 @@
/* get only the required items */
- if (msLayerWhichItems(srclayer, FALSE, NULL) != MS_SUCCESS)
+ if (msLayerWhichItems(srclayer, MS_FALSE, NULL) != MS_SUCCESS)
return MS_FAILURE;
}