dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

- upgraded to 0.10.0 release candidate

Browse Source 
- removed gcc 4.3 patches
- adding devel package since libraries are now versioned
This commit is contained in:
Douglas E. Warner 2008-06-01 21:30:49 +00:00
parent d1016f46d7
commit 4845898e55
8 changed files with 30 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
qgis-0.9.1.tar.gz
qgis_0.10.0.tar.gz

33
gcc43-INT_MAX-qgis-0.9.1.patch
View File

@ -1,33 +0,0 @@
diff -ruN qgis-0.9.1/src/app/main.cpp qgis-0.9.1-new/src/app/main.cpp
--- qgis-0.9.1/src/app/main.cpp 2007-11-10 16:57:38.000000000 -0500
+++ qgis-0.9.1-new/src/app/main.cpp 2008-02-18 12:57:17.000000000 -0500
@@ -35,6 +35,7 @@
#include <QTranslator>
#include <iostream>
+#include <climits>
#include <cstdio>
#include <stdio.h>
#include <stdlib.h>
diff -ruN qgis-0.9.1/src/core/qgsvectordataprovider.cpp qgis-0.9.1-new/src/core/qgsvectordataprovider.cpp
--- qgis-0.9.1/src/core/qgsvectordataprovider.cpp 2007-07-06 09:39:41.000000000 -0400
+++ qgis-0.9.1-new/src/core/qgsvectordataprovider.cpp 2008-02-18 14:21:09.000000000 -0500
@@ -16,6 +16,7 @@
#include <QTextCodec>
+#include <climits>
#include <cfloat> // for DBL_MAX
#include "qgsvectordataprovider.h"
diff -ruN qgis-0.9.1/src/core/qgsvectorlayer.cpp qgis-0.9.1-new/src/core/qgsvectorlayer.cpp
--- qgis-0.9.1/src/core/qgsvectorlayer.cpp 2007-11-27 16:35:10.000000000 -0500
+++ qgis-0.9.1-new/src/core/qgsvectorlayer.cpp 2008-02-18 14:04:09.000000000 -0500
@@ -22,6 +22,7 @@
/* $Id: qgsvectorlayer.cpp 7672 2007-11-27 21:35:10Z jef $ */
#include <cassert>
+#include <climits>
#include <cfloat>
#include <cstring>
#include <cmath>

34
gcc43-duplicate_function_param-qgis-0.9.1.patch
View File

@ -1,34 +0,0 @@
diff -ruN qgis-0.9.1/src/core/spatialindex/include/RTree.h qgis-0.9.1-new/src/core/spatialindex/include/RTree.h
--- qgis-0.9.1/src/core/spatialindex/include/RTree.h 2007-09-27 15:41:16.000000000 -0400
+++ qgis-0.9.1-new/src/core/spatialindex/include/RTree.h 2008-02-18 14:58:50.000000000 -0500
@@ -70,13 +70,7 @@
unsigned long m_dataLength;
}; // Data
-#ifdef _MSC_VER
- // MSVC didn't like the difference in parameter names between declaration
- // definition
extern ISpatialIndex* returnRTree(IStorageManager& sm, Tools::PropertySet& ps);
-#else
- extern ISpatialIndex* returnRTree(IStorageManager& in, Tools::PropertySet& in);
-#endif//_MSC_VER
extern ISpatialIndex* createNewRTree(
IStorageManager& sm,
double fillFactor,
diff -ruN qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h
--- qgis-0.9.1/src/core/spatialindex/include/SpatialIndex.h 2007-09-27 15:41:16.000000000 -0400
+++ qgis-0.9.1-new/src/core/spatialindex/include/SpatialIndex.h 2008-02-18 14:44:04.000000000 -0500
@@ -183,13 +183,7 @@
extern IStorageManager* createNewDiskStorageManager(std::string& baseName, unsigned long pageSize);
extern IStorageManager* loadDiskStorageManager(std::string& baseName);
-#ifdef _MSC_VER
- // MSVC didn't like the difference in parameter names between declaration
- // definition
extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& sm, Tools::PropertySet& ps);
-#else
- extern IBuffer* returnRandomEvictionsBuffer(IStorageManager& in, Tools::PropertySet& in);
-#endif//_MSC_VER
extern IBuffer* createNewRandomEvictionsBuffer(IStorageManager& in, unsigned int capacity, bool bWriteThrough);
}

21
gcc43-memcpy-qgis-0.9.1.patch
View File

@ -1,21 +0,0 @@
diff -ruN qgis-0.9.1/src/core/spatialindex/include/Tools.h qgis-0.9.1-new/src/core/spatialindex/include/Tools.h
--- qgis-0.9.1/src/core/spatialindex/include/Tools.h 2007-09-27 15:41:16.000000000 -0400
+++ qgis-0.9.1-new/src/core/spatialindex/include/Tools.h 2008-02-18 15:31:15.000000000 -0500
@@ -24,8 +24,8 @@
#ifdef _MSC_VER
#include <locale>
-#include <limits>
#endif//_MSC_VER
+#include <limits>
#include <stdint.h>
#include <assert.h>
#include <iostream>
@@ -43,6 +43,7 @@
#include <algorithm>
#include <cmath>
#include <climits>
+#include <cstring>
#if TIME_WITH_SYS_TIME
#include <sys/time.h>

22
gcc43-memcpy-strtod-qgis-0.9.1.patch
View File

@ -1,22 +0,0 @@
diff -ruN qgis-0.9.1/src/providers/gpx/qgsgpxprovider.cpp qgis-0.9.1-new/src/providers/gpx/qgsgpxprovider.cpp
--- qgis-0.9.1/src/providers/gpx/qgsgpxprovider.cpp 2007-11-04 20:23:41.000000000 -0500
+++ qgis-0.9.1-new/src/providers/gpx/qgsgpxprovider.cpp 2008-02-18 15:53:38.000000000 -0500
@@ -22,6 +22,7 @@
#include <iostream>
#include <limits>
#include <cmath>
+#include <cstring>
// Changed #include <qapp.h> to <qapplication.h>. Apparently some
// debian distros do not include the qapp.h wrapper and the compilation
diff -ruN qgis-0.9.1/src/providers/postgres/qgspostgisbox2d.h qgis-0.9.1-new/src/providers/postgres/qgspostgisbox2d.h
--- qgis-0.9.1/src/providers/postgres/qgspostgisbox2d.h 2007-01-08 21:39:15.000000000 -0500
+++ qgis-0.9.1-new/src/providers/postgres/qgspostgisbox2d.h 2008-02-18 15:52:43.000000000 -0500
@@ -20,6 +20,7 @@
#ifndef QGSPOSTGISBOX2D_H
#define QGSPOSTGISBOX2D_H
+#include <cstdlib>
#include <string>
#include "qgsrect.h"

53
gcc43-qgis-0.9.1.patch
View File

@ -1,53 +0,0 @@
--- src/providers/gpx/gpsdata.cpp.orig 2007-02-01 17:44:20.000000000 +0200
+++ src/providers/gpx/gpsdata.cpp 2008-03-28 18:04:58.000000000 +0200
@@ -15,6 +15,7 @@
* *
***************************************************************************/
+#include <cstring>
#include <limits>
#include <stdexcept>
--- src/providers/postgres/qgspostgisbox3d.cpp.orig 2008-03-28 18:12:21.000000000 +0200
+++ src/providers/postgres/qgspostgisbox3d.cpp 2008-03-28 18:14:11.000000000 +0200
@@ -17,6 +17,8 @@
***************************************************************************/
/* $Id: qgspostgisbox3d.cpp 6415 2007-01-09 02:39:15Z wonder $ */
+#include <stdlib.h>
+
#include <fstream>
#include <QString>
--- src/plugins/grass/qgsgrassmapcalc.cpp.orig 2008-03-28 18:19:45.000000000 +0200
+++ src/plugins/grass/qgsgrassmapcalc.cpp 2008-03-28 18:20:01.000000000 +0200
@@ -13,6 +13,7 @@
* *
*************************************************************************/
#include <iostream>
+#include <typeinfo>
#include <qapplication.h>
#include <qstringlist.h>
--- src/app/composer/qgscomposition.cpp.orig 2008-03-28 18:27:35.000000000 +0200
+++ src/app/composer/qgscomposition.cpp 2008-03-28 18:27:55.000000000 +0200
@@ -13,6 +13,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
+#include <typeinfo>
+
#include "qgscomposition.h"
#include "qgscomposer.h"
--- src/plugins/grass/qgsgrassmodule.cpp.orig 2008-03-28 18:54:29.000000000 +0200
+++ src/plugins/grass/qgsgrassmodule.cpp 2008-03-28 18:54:55.000000000 +0200
@@ -13,6 +13,8 @@
* (at your option) any later version. *
* *
***************************************************************************/
+#include <typeinfo>
+
#include <q3cstring.h>
#include <q3groupbox.h>
#include <q3listbox.h>

73
qgis.spec
View File

@ -2,21 +2,16 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: qgis
Version: 0.9.1
Release: 5%{?dist}
Version: 0.10.0
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
License: GPLv2+
URL: http://qgis.org/
Source0: http://download.qgis.org/qgis/src/%{name}-%{version}.tar.gz
Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
Source1: %{name}.desktop
Patch0: python-site-packages-dir-0.9.1.patch
Patch1: gcc43-INT_MAX-qgis-0.9.1.patch
Patch2: gcc43-duplicate_function_param-qgis-0.9.1.patch
Patch3: gcc43-memcpy-qgis-0.9.1.patch
Patch4: gcc43-memcpy-strtod-qgis-0.9.1.patch
Patch5: gcc43-qgis-0.9.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: sip
@ -31,7 +26,6 @@ BuildRequires: geos-devel
BuildRequires: gsl-devel
BuildRequires: postgresql-devel
BuildRequires: sqlite-devel
BuildRequires: python-devel
# grass package contains definitions needed for configure script
BuildRequires: grass, grass-devel
BuildRequires: python-devel
@ -46,13 +40,13 @@ computer. It supports many common spatial data formats (e.g. ESRI ShapeFile,
geotiff). QGIS supports plugins to do things like display tracks from your GPS.
#%package devel
#Summary: Headers and libraries for building against qgis
#Group: Development/Libraries
#Requires: %{name} = %{version}-%{release}
#
#%description devel
#Headers and libraries for building against qgis
%package devel
Summary: Headers and libraries for building against qgis
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Headers and libraries for building against qgis
%package grass
@ -86,11 +80,11 @@ Addtional theme for qgis - nkids
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p0
# fix spurious executable bits
%{__chmod} -x \
./src/app/legend/qgslegend.h \
./src/app/legend/qgslegend.cpp
%build
@ -105,7 +99,6 @@ done
-D GRASS_PREFIX=$GRASS_PREFIX \
-D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
-D GDAL_LIBRARY=%{_libdir}/libgdal.so \
-D CMAKE_SKIP_RPATH:BOOL=ON \
.
make VERBOSE=1 %{?_smp_mflags}
@ -114,27 +107,10 @@ make VERBOSE=1 %{?_smp_mflags}
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
# remove archives
#find %{buildroot} -name '*.a' -exec %{__rm} -f {} ';'
#find %{buildroot} -name '*.la' -exec %{__rm} -f {} ';'
# fix spurious executable bits
%{__chmod} -x ./src/app/legend/qgslegend.h \
./src/app/legend/qgslegend.cpp
# remove files packaged by doc
%{__rm} -f %{buildroot}/%{_datadir}/doc/AUTHORS \
%{buildroot}/%{_datadir}/doc/SPONSORS
# remove .cvsignore files
#find . -name '.cvsignore' -exec %{__rm} -f {} ';'
# fix non-executable file
%{__chmod} +x %{buildroot}/%{_datadir}/%{name}/python/test_export.py
# remove headers
%{__rm} -rf %{buildroot}/%{_includedir}/%{name}
# install desktop file
%{__install} -d %{buildroot}/%{_datadir}/pixmaps
%{__install} -m0644 \
@ -162,8 +138,7 @@ desktop-file-install --vendor="fedora" \
%doc AUTHORS BUGS COPYING ChangeLog README SPONSORS CONTRIBUTORS
%{_bindir}/%{name}
%{_bindir}/%{name}_help
%{_bindir}/msexport
%{_libdir}/lib%{name}_*.so
%{_libdir}/lib%{name}_*.so.*
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/libcopyrightlabelplugin.so
%{_libdir}/%{name}/libdelimitedtextplugin.so
@ -176,6 +151,7 @@ desktop-file-install --vendor="fedora" \
%{_libdir}/%{name}/libogrprovider.so
%{_libdir}/%{name}/libpggeoprocessingplugin.so
%{_libdir}/%{name}/libpostgresprovider.so
%{_libdir}/%{name}/libquickprintplugin.so
%{_libdir}/%{name}/libscalebarplugin.so
%{_libdir}/%{name}/libspitplugin.so
%{_libdir}/%{name}/libwfsplugin.so
@ -196,13 +172,15 @@ desktop-file-install --vendor="fedora" \
%{python_sitearch}/%{name}
%{_mandir}/man1/*
#%files devel
#%defattr(-, root, root, -)
#%{_includedir}/%{name}
%files devel
%defattr(-, root, root, -)
%{_includedir}/%{name}
%{_libdir}/lib%{name}_*.so
%{_libdir}/libqgisgrass.so
%files grass
%defattr(-, root, root, -)
%{_libdir}/libqgisgrass.so
%{_libdir}/libqgisgrass.so.*
%{_libdir}/%{name}/libgrass*.so
%{_datadir}/%{name}/grass
%{_datadir}/%{name}/themes/default/grass
@ -217,6 +195,11 @@ desktop-file-install --vendor="fedora" \
%changelog
* Fri Mar 28 2008 Balint Cristian <rezso@rdsor.ro> - 0.10.0-1
- upgraded to 0.10.0 release candidate
- removed gcc 4.3 patches
- adding devel package since libraries are now versioned
* Fri Mar 28 2008 Balint Cristian <rezso@rdsor.ro> - 0.9.1-5
- fix build by adding more gcc43 patches
- rebuild against grass63

2
sources
View File

@ -1 +1 @@
cc1be019033451ec6c4b3838b26d69ae qgis-0.9.1.tar.gz
01fba16f6e6e4f2cd832b520dfd05dd8 qgis_0.10.0.tar.gz