Attachment 730938 Details for Bug 912087 – Patch to update to mapnik 2.1.0

[patch] Patch to update to mapnik 2.1.0

mapnik-2.1.0.patch (text/plain), 8.72 KB, created by Tom Hughes on 2013-04-02 19:09:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Hughes

Created: 2013-04-02 19:09:48 UTC

Size: 8.72 KB

patch

obsolete

>commit 46bd8c7219cdf7edfed482f95b1869685ee5b27e
>Author: Tom Hughes <tom@compton.nu>
>Date:   Sun Feb 17 16:49:48 2013 +0000
>
>    Update to 2.1.0 upstream release
>
>diff --git a/mapnik-2.0.0-64bit.patch b/mapnik-2.0.0-64bit.patch
>deleted file mode 100644
>index 1afe002..0000000
>--- a/mapnik-2.0.0-64bit.patch
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-diff -up mapnik-2.0.0/SConstruct.64bit mapnik-2.0.0/SConstruct
>---- mapnik-2.0.0/SConstruct.64bit	2013-01-02 14:56:07.000000000 +0100
>-+++ mapnik-2.0.0/SConstruct	2013-01-02 14:56:49.000000000 +0100
>-@@ -265,7 +265,7 @@ if platform.dist()[0] in ('Ubuntu','debi
>-     LIBDIR_SCHEMA='lib'
>- elif platform.uname()[4] == 'x86_64' and platform.system() == 'Linux':
>-     LIBDIR_SCHEMA='lib64' 
>--elif platform.uname()[4] == 'ppc64':
>-+elif platform.uname()[4] in ['ppc64', 's390x', 'sparc64']:
>-     LIBDIR_SCHEMA='lib64'
>- else:
>-     LIBDIR_SCHEMA='lib'
>diff --git a/mapnik-2.0.0-big-endian.patch b/mapnik-2.0.0-big-endian.patch
>deleted file mode 100644
>index 00e89ca..0000000
>--- a/mapnik-2.0.0-big-endian.patch
>+++ /dev/null
>@@ -1,19 +0,0 @@
>-commit f8e2a3ed1b13fb2e37fb890ae452eea98054f4f9
>-Author: Dane Springmeyer <dane@dbsgeo.com>
>-Date:   Mon Oct 10 14:03:43 2011 -0700
>-
>-    fix compile on ppc (big endian) systems
>-
>-diff --git a/include/mapnik/grid/grid.hpp b/include/mapnik/grid/grid.hpp
>-index bf644bb..8951d93 100644
>---- a/include/mapnik/grid/grid.hpp
>-+++ b/include/mapnik/grid/grid.hpp
>-@@ -284,7 +284,7 @@ public:
>-         {
>- 
>- #ifdef MAPNIK_BIG_ENDIAN
>--            unsigned a1 = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
>-+            unsigned a = (int)((rgba1 & 0xff) * opacity) & 0xff; // adjust for desired opacity
>- #else
>-             unsigned a = (int)(((rgba1 >> 24) & 0xff) * opacity) & 0xff; // adjust for desired opacity
>- #endif                    
>diff --git a/mapnik-2.0.0-build-viewer.patch b/mapnik-2.0.0-build-viewer.patch
>deleted file mode 100644
>index 77a59c8..0000000
>--- a/mapnik-2.0.0-build-viewer.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>---- demo/viewer/viewer.pro.orig	2011-11-22 15:31:15.047234855 -0500
>-+++ demo/viewer/viewer.pro	2011-11-22 15:32:35.205213622 -0500
>-@@ -4,14 +4,15 @@
>- CC = g++
>- TEMPLATE = app
>- 
>--INCLUDEPATH += /usr/local/include/
>-+INCLUDEPATH += /usr/include/
>-+INCLUDEPATH += ../../include/
>- INCLUDEPATH += /usr/boost/include/
>- INCLUDEPATH += /usr/X11/include/
>--INCLUDEPATH += /usr/X11/include/freetype2
>-+INCLUDEPATH += /usr/include/freetype2
>- INCLUDEPATH += .
>- 
>- QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
>--unix:LIBS =  -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
>-+unix:LIBS = -L../../src/ -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
>- unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex
>- 
>- # Input
>diff --git a/mapnik-2.1.0-build-viewer.patch b/mapnik-2.1.0-build-viewer.patch
>new file mode 100644
>index 0000000..d3025ed
>--- /dev/null
>+++ b/mapnik-2.1.0-build-viewer.patch
>@@ -0,0 +1,20 @@
>+diff --git a/demo/viewer/viewer.pro b/demo/viewer/viewer.pro
>+index 048cfad..fe0e429 100644
>+--- a/demo/viewer/viewer.pro
>++++ b/demo/viewer/viewer.pro
>+@@ -2,10 +2,11 @@
>+ # Mapnik viewer - Copyright (C) 2007 Artem Pavlenko
>+ ######################################################################
>+ TEMPLATE = app
>+-QMAKE_CXX = clang++
>+-QMAKE_CXXFLAGS += $$system(mapnik-config --cflags)
>+-QMAKE_LFLAGS += $$system(mapnik-config --libs)
>+-QMAKE_LFLAGS += $$system(mapnik-config --ldflags --dep-libs)
>++QMAKE_CXX = g++
>++QMAKE_CXXFLAGS += -I../../include
>++QMAKE_CXXFLAGS += $$system(../../utils/mapnik-config/mapnik-config --cflags)
>++QMAKE_LFLAGS += -L../../src -l mapnik
>++QMAKE_LFLAGS += $$system(../../utils/mapnik-config/mapnik-config --ldflags --dep-libs)
>+ 
>+ # Input
>+ 
>diff --git a/mapnik.spec b/mapnik.spec
>index 9565d29..65215aa 100644
>--- a/mapnik.spec
>+++ b/mapnik.spec
>@@ -1,17 +1,15 @@
> Name:      mapnik
>-Version:   2.0.0
>-Release:   13%{?dist}
>+Version:   2.1.0
>+Release:   2%{?dist}
> Summary:   Free Toolkit for developing mapping applications
> Group:     Applications/Engineering
> License:   LGPLv2+
> URL:       http://mapnik.org/
>-Source0:   http://download.berlios.de/mapnik/mapnik-%{version}.tar.bz2
>+Source0:   https://github.com/downloads/mapnik/mapnik/mapnik-v%{version}.tar.bz2
> Source1:   mapnik-data.license
> Source2:   no_date_footer.html
> Source3:   viewer.desktop
>-Patch0:	   mapnik-2.0.0-build-viewer.patch
>-Patch1:	   mapnik-2.0.0-big-endian.patch
>-Patch2:	   mapnik-2.0.0-64bit.patch
>+Patch0:	   mapnik-2.1.0-build-viewer.patch
> 
> Requires: dejavu-serif-fonts dejavu-sans-fonts dejavu-sans-mono-fonts dejavu-lgc-serif-fonts dejavu-lgc-sans-fonts dejavu-lgc-sans-mono-fonts
> Requires: proj-epsg
>@@ -23,10 +21,14 @@ BuildRequires: libtool-ltdl-devel qt-devel > 4.3
> BuildRequires: libxml2-devel boost-devel libicu-devel
> BuildRequires: libtiff-devel libjpeg-devel libpng-devel
> BuildRequires: cairomm-devel pycairo-devel freetype-devel
>+BuildRequires: sqlite-devel libcurl-devel
> 
> %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
> %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
> 
>+%filter_provides_in %{_libdir}/%{name}/input
>+%filter_setup
>+
> %description
> Mapnik is a Free Toolkit for developing mapping applications.
> It's written in C++ and there are Python bindings to
>@@ -98,11 +100,9 @@ Demo application and sample vector datas distributed with the Mapnik
> spatial visualization library
> 
> %prep
>-%setup -q -n %{name}-%{version}
>+%setup -q -n %{name}-v%{version}
> 
>-%patch0 -p0
>-%patch1 -p1
>-%patch2 -p1
>+%patch0 -p1
> 
> # clean SVN
> find . -type d -name .svn -exec rm -rf '{}' +
>@@ -128,7 +128,6 @@ set -x
> 
> # fix spurious exec flag
> chmod -x demo/viewer/images/*.png
>-chmod -x bindings/python/mapnik/ogcserver/modserver.py
> chmod -x demo/data/test/regenerate.sh
> find . -type d -perm /g+s -exec chmod -s '{}' \;
> 
>@@ -151,32 +150,30 @@ sed -i -e 's|/usr/local|/usr|g' demo/viewer/viewer.pro
> # fix build flags
> sed -i -e "s|common_cxx_flags = .-D\%s|common_cxx_flags = \'-D\%s $RPM_OPT_FLAGS |g" SConstruct
> 
>-# WARNING smp may break build
>-# %{?_smp_mflags}
>-scons         PREFIX=%{_prefix} \
>-              THREADING=multi \
>-              XMLPARSER=libxml2 \
>-              GDAL_INCLUDES=%{_includedir}/gdal \
>-              INTERNAL_LIBAGG=False \
>-	      SYSTEM_FONTS=%{_datadir}/fonts \
>-	      BOOST_SYSTEM_REQUIRED=True
>+# configure mapnik
>+scons configure DESTDIR=%{buildroot} \
>+                PREFIX=%{_prefix} \
>+                THREADING=multi \
>+                XMLPARSER=libxml2 \
>+                GDAL_INCLUDES=%{_includedir}/gdal \
>+                INTERNAL_LIBAGG=False \
>+	        SYSTEM_FONTS=%{_datadir}/fonts \
>+	        BOOST_SYSTEM_REQUIRED=True \
>+                LIBDIR_SCHEMA=%{_lib}
>+
>+# build mapnik
>+scons %{?_smp_mflags}
> 
> # build mapnik viewer app
> pushd demo/viewer
> qmake-qt4 viewer.pro
>-# WARNING smp may break build
>-# %{?_smp_mflags}
>-make
>+make %{?_smp_mflags}
> popd
> 
> %install
> 
>-scons install DESTDIR=%{buildroot} \
>-              PREFIX=%{_prefix} \
>-              THREADING=multi \
>-              XMLPARSER=libxml2 \
>-              GDAL_INCLUDES=%{_includedir}/gdal \
>-              INTERNAL_LIBAGG=False
>+# install mapnik
>+scons install
> 
> # get rid of fonts use external instead
> rm -rf %{buildroot}%{_libdir}/%{name}/fonts
>@@ -233,29 +230,31 @@ popd
> 
> %files
> %defattr(-,root,root,-)
>-%doc AUTHORS COPYING README
>-%dir %{_libdir}/%{name}2
>-%dir %{_libdir}/%{name}2/input
>+%doc AUTHORS.md CHANGELOG.md COPYING README.md
>+%dir %{_libdir}/%{name}
>+%dir %{_libdir}/%{name}/input
> %{_bindir}/mapnik-config
>-%{_libdir}/%{name}2/input/*.input
>-%{_libdir}/lib%{name}2.so.*
>+%{_libdir}/%{name}/input/*.input
>+%{_libdir}/lib%{name}.so.*
> 
> %files devel
> %defattr(-,root,root,-)
> %doc docs/
> %dir %{_includedir}/%{name}
> %{_includedir}/%{name}/*
>-%{_libdir}/lib%{name}2.so
>+%{_libdir}/lib%{name}.so
> %{_datadir}/pkgconfig/%{name}.pc
> 
> %files python
> %defattr(-,root,root,-)
>+%{python_sitearch}/%{name}
> %{python_sitearch}/%{name}2
> %{_bindir}/mapdef_stats.py
> 
> %files utils
> %defattr(-,root,root,-)
> %{_bindir}/shapeindex
>+%{_bindir}/svg2png
> %{_bindir}/viewer
> %{_bindir}/mapnik-speed-check
> %{_bindir}/upgrade_map_xml.py
>@@ -272,6 +271,15 @@ popd
> %doc demo/python demo/test
> 
> %changelog
>+* Tue Apr  2 2013 Tom Hughes <tom@compton.nu> - 2.1.0-2
>+- Avoid recompilation during install phase
>+- Use parallel compilation
>+- BuildRequire libcurl-devel for the osm plugin
>+
>+* Sat Feb 16 2013 Tom Hughes <tom@compton.nu> - 2.1.0-1
>+- Update to 2.1.0 upstream release
>+- Filter out provides from the plugins
>+
> * Thu Feb 14 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 2.0.0-13
> - Remove --vendor from desktop-file-install https://fedorahosted.org/fesco/ticket/1077
>

Actions: View | Diff

Attachments on bug 912087: 698540 | 699384 | 718069 | 718075 | 730938 | 730969 | 730986