rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 451655 from home:Le_Docteur:branches:Application:Geo

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/451655
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=207
This commit is contained in:
Nicolas Rochard 2017-01-20 15:08:18 +00:00 committed by Git OBS Bridge
parent 58386c507a
commit 6ab6e1d2ec
6 changed files with 61 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qgis-2.18.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3abcd3e21d875e353e6e1cf729f444677b9d209d30beeb1bb8d0afac7d28b0ea
size 92501258

3
qgis-2.18.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97e374b1a3c330a5e5cfd7cd6ee75414e5a96aaee4ef2568ab753660975d372b
size 92523924

7
qgis.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 18 10:32:58 UTC 2017 - nrochard@gmail.com
- Update to 2.18.3
- Packaging :
+ added upstream-2c43568-qt_bug.patch to fix build errors on Leap
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 5 09:12:22 UTC 2017 - guillaume@opensuse.org Thu Jan 5 09:12:22 UTC 2017 - guillaume@opensuse.org

2
qgis.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Encoding=UTF-8 Encoding=UTF-8
Name=QGIS 2.18.2 (Las Palmas) Name=QGIS 2.18.3 (Las Palmas)
GenericName=Geographic Information System GenericName=Geographic Information System
Comment= Comment=
Exec=qgis Exec=qgis

7
qgis.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package qgis # spec file for package qgis
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,7 +17,7 @@
Name: qgis Name: qgis
Version: 2.18.2 Version: 2.18.3
Release: 0 Release: 0
Summary: QGIS is a Geographic Information System (GIS) Summary: QGIS is a Geographic Information System (GIS)
License: GPL-2.0 License: GPL-2.0
@ -27,6 +27,8 @@ Source: %{name}-%{version}.tar.bz2
Source1: %{name}.desktop Source1: %{name}.desktop
Source2: %{name}.rpmlintrc Source2: %{name}.rpmlintrc
Source3: qgis_sample_data.zip Source3: qgis_sample_data.zip
# Upstream fix for build bug with qt
Patch0: upstream-2c43568-qt_bug.patch
BuildRequires: sqlite-devel >= 3.5 BuildRequires: sqlite-devel >= 3.5
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: python-wxWidgets BuildRequires: python-wxWidgets
@ -124,6 +126,7 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"

45
upstream-2c43568-qt_bug.patch Normal file
View File

@ -0,0 +1,45 @@
From 77b8c3d67b868024e31120a38e3df9c0583e90bd Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 13 Jan 2017 15:54:27 +0100
Subject: [PATCH] fix 2c43568
---
src/server/qgsserver.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/server/qgsserver.cpp b/src/server/qgsserver.cpp
index 6758f036..4f51aa0 100644
--- a/src/server/qgsserver.cpp
+++ b/src/server/qgsserver.cpp
@@ -202,18 +202,18 @@ void QgsServer::printRequestParameters( const QMap< QString, QString>& parameter
*/
void QgsServer::printRequestInfos()
{
- QgsMessageLog::logMessage( QStringLiteral( "******************** New request ***************" ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "******************** New request ***************", "Server", QgsMessageLog::INFO );
if ( getenv( "REMOTE_ADDR" ) )
{
- QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_ADDR: " + QString( getenv( "REMOTE_ADDR" ) ), "Server", QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_HOST" ) )
{
- QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_HOST: " + QString( getenv( "REMOTE_HOST" ) ), "Server", QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_USER" ) )
{
- QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "REMOTE_USER: " + QString( getenv( "REMOTE_USER" ) ), "Server", QgsMessageLog::INFO );
}
if ( getenv( "REMOTE_IDENT" ) )
{
@@ -245,7 +245,7 @@ void QgsServer::printRequestInfos()
}
if ( getenv( "HTTP_AUTHORIZATION" ) )
{
- QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), QStringLiteral( "Server" ), QgsMessageLog::INFO );
+ QgsMessageLog::logMessage( "HTTP_AUTHORIZATION: " + QString( getenv( "HTTP_AUTHORIZATION" ) ), "Server", QgsMessageLog::INFO );
}
}