pool/qgis
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=116
This commit is contained in:
Otto Dassau 2010-11-08 11:30:55 +00:00 committed by Git OBS Bridge
parent ea170f9763
commit 5b5c0ba1cf
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qgis.spec
View File

@ -6,8 +6,7 @@ Group: Applications/GIS
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop
Source2: %{name}.rpmlintrc
#Patch0: sqlite3.patch
#Patch1: sip49_support.patch
Patch0: qgis15_pyqt4.patch
Url: http://www.qgis.org/
Summary: Quantum GIS (QGIS) is a Geographic Information System (GIS)
Packager: Otto Dassau <dassau@gbd-consult.de>
@ -81,8 +80,7 @@ GRASS plugin for Quantum GIS development branch 1.x required to interface with G
%prep
%setup
#%patch0 -p1
#%patch1 -p1
%patch0 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
@ -173,7 +171,9 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog -n qgis
* Mon Aug 09 2010 Otto Dassau <dassau@gbd-consult.de> 1.5
* Mon Nov 08 2010 Otto Dassau <dassau@gbd-consult.de> 1.5
- added qgis15_pyqt4.patch to support pyqt4 >= 4.7.5
* Mon Aug 09 2010 Otto Dassau 1.5
- added qwt to support GPS tracker module
* Sun Jul 18 2010 Otto Dassau 1.5
- changes and updates for new qgis development version

13
qgis15_pyqt4.patch Normal file
View File

@ -0,0 +1,13 @@
--- qgis-1.5.0/python/CMakeLists.txt 2010-05-15 10:21:42.000000000 +0200
+++ qgis-1.5.0_new/python/CMakeLists.txt 2010-11-08 12:28:50.532775007 +0100
@@ -39,6 +39,10 @@
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680)
+IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ENDIF(NOT SIP_VERSION_NUM LESS 263941)
+
# core module
FILE(GLOB sip_files_core core/*.sip)
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})