[packages/libreatlas] - fix building with wxWidgets 3.0 - rel 4

baggins baggins at pld-linux.org
Sat Jan 18 18:39:13 CET 2014


commit 61b69e4a101e4ce2fa209ca88f93a2f75cc1dac9
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jan 18 18:38:58 2014 +0100

    - fix building with wxWidgets 3.0
    - rel 4

 libreatlas.spec  |  4 +++-
 wxWidgets3.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/libreatlas.spec b/libreatlas.spec
index 513d1d3..021f4a9 100644
--- a/libreatlas.spec
+++ b/libreatlas.spec
@@ -2,12 +2,13 @@ Summary:	Geography Education application built on top of SpatiaLite and RasterLi
 Summary(pl.UTF-8):	Geograficzny program edukacyjny stworzony w oparciu o SpatiaLite i RasterLite
 Name:		libreatlas
 Version:	1.0.0a
-Release:	3
+Release:	4
 License:	GPL v3+
 Group:		Applications
 Source0:	http://www.gaia-gis.it/gaia-sins/libreatlas-sources/%{name}-%{version}.tar.gz
 # Source0-md5:	d09d57d2cbb0b05be0e3ff9ad925d86a
 Patch0:		%{name}-link.patch
+Patch1:		wxWidgets3.patch
 URL:		https://www.gaia-gis.it/fossil/libreatlas
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
@@ -42,6 +43,7 @@ danych LibreAtlas, będące cyfrową alternatywą dla atlasu papierowego.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 mkdir wx-bin
 ln -sf /usr/bin/wx-gtk2-unicode-config wx-bin/wx-config
diff --git a/wxWidgets3.patch b/wxWidgets3.patch
new file mode 100644
index 0000000..99572fd
--- /dev/null
+++ b/wxWidgets3.patch
@@ -0,0 +1,12 @@
+--- libreatlas-1.0.0a/MapView.cpp~	2012-07-04 21:09:41.000000000 +0200
++++ libreatlas-1.0.0a/MapView.cpp	2014-01-18 18:36:54.902069986 +0100
+@@ -24,7 +24,8 @@
+ */
+ 
+ #include "Classdef.h"
+-#include "wx/mstream.h"
++#include <wx/graphics.h>
++#include <wx/mstream.h>
+ 
+ #include <float.h>
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libreatlas.git/commitdiff/61b69e4a101e4ce2fa209ca88f93a2f75cc1dac9



More information about the pld-cvs-commit mailing list